diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-11-28 18:03:35 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-09-08 15:44:52 +0530 |
| commit | 7d2f0422c692aea3e628ea1345fda38a0cd9b321 (patch) | |
| tree | 9eba9b478d0c0985b4f3414b27574c1d9962ae38 | |
| parent | f3b17b5179323eea345f0ce9eabd2672d2d89595 (diff) | |
HACK: ANDROID: Revert "usb: gadget: f_fs: Fix wrong check on reserved1 of OS_DESC_EXT_COMPAT"linaro-android-4.13
This reverts commit 53642399aa71b7c3b15d0305dc54738c4222bb1e.
This explicit check breaks ADB Gadget when OS DESC support
is enabled, so revert this upstream commit for now.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index d21874b35cf6..55b03ee07bef 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -2279,7 +2279,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]) |