shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "usb: gadget: f_fs: Update driver to handle compat id descriptors"

Browse Source 
This reverts commit 548b453dcc which
is replaced with the upstream commit 53642399aa ("usb: gadget: f_fs:
Fix wrong check on reserved1 of OS_DESC_EXT_COMPAT").

Change-Id: I34e0f68d1e54a1852d021ee3ef78e3944fea675f
Signed-off-by: William Wu <william.wu@rock-chips.com>
This commit is contained in:
William Wu
2018-02-08 09:48:10 +08:00
committed by Tao Huang
parent 63c07f8a39
commit 2f0ec89e19
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/gadget/function/f_fs.c
View File

@@ -2073,17 +2073,11 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_type type,
if (len < sizeof(*d) ||
d->bFirstInterfaceNumber >= ffs->interfaces_count ||
d->Reserved1 != 1) {
pr_err("%s(): Invalid os_desct_ext_compat\n",
__func__);
d->Reserved1)
return -EINVAL;
}
for (i = 0; i < ARRAY_SIZE(d->Reserved2); ++i)
if (d->Reserved2[i]) {
pr_err("%s(): Invalid Reserved2 of ext_compat\n",
__func__);
if (d->Reserved2[i])
return -EINVAL;
}
length = sizeof(struct usb_ext_compat_desc);
}