diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-11-28 18:03:35 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-07-17 11:22:45 +0530 |
| commit | a9373167cb8b70156d5db2dede7e39c682c06867 (patch) | |
| tree | a8fcebb5fb5e8ce650ce2660afb614a0a3d5fa16 | |
| parent | 42783296b50846b17550b024f82b0830f6ec6051 (diff) | |
| download | linaro-android-test/llct-4.13-master.tar.gz | |
HACK: ANDROID: Revert "usb: gadget: f_fs: Fix wrong check on reserved1 of OS_DESC_EXT_COMPAT"test/llct-4.13-master
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]) |