Revert "usb: gadget: f_fs: Fix ExtCompat descriptor validation"
authorJanusz Dziedzic <januszx.dziedzic@linux.intel.com>
Thu, 16 Feb 2017 13:54:12 +0000 (14:54 +0100)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Mon, 6 Mar 2017 14:55:04 +0000 (16:55 +0200)
This reverts commit ac670a3a650b899fc020b81f63e810d06015b865.

This introduce bug we already fixed in
commit 53642399aa71 ("usb: gadget: f_fs: Fix wrong check on reserved1 wof OS_DESC_EXT_COMPAT")

Next FFS (adb) SS enumeration fail with Windows OS.

Signed-off-by: Janusz Dziedzic <januszx.dziedzic@linux.intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/gadget/function/f_fs.c

index 7e976f00cb0277ef1e28d8662d4341ad92efd489..a0085571824d9b4352c7245625a30c3248d789f5 100644 (file)
@@ -2264,7 +2264,7 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_type type,
 
                if (len < sizeof(*d) ||
                    d->bFirstInterfaceNumber >= ffs->interfaces_count ||
-                   d->Reserved1)
+                   !d->Reserved1)
                        return -EINVAL;
                for (i = 0; i < ARRAY_SIZE(d->Reserved2); ++i)
                        if (d->Reserved2[i])