diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2016-11-28 18:03:35 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-05-01 11:49:46 +0530 |
| commit | 40ec508e0261b8de98f3270fde055bd72b20a9b7 (patch) | |
| tree | d3cd56f0b88655dcdc4de4188ac430ec1cdfc57b | |
| parent | 72420589afb500ab8243c03635ee24aa2f2cc152 (diff) | |
| download | linaro-android-4.11.tar.gz | |
HACK: ANDROID: Revert "usb: gadget: f_fs: Fix wrong check on reserved1 of OS_DESC_EXT_COMPAT"linaro-android-4.11
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 a0085571824d..7e976f00cb02 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -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]) |