From 2f0ec89e19274c153b4b8e159cc25c9789ae6136 Mon Sep 17 00:00:00 2001 From: William Wu Date: Thu, 8 Feb 2018 09:48:10 +0800 Subject: [PATCH] Revert "usb: gadget: f_fs: Update driver to handle compat id descriptors" This reverts commit 548b453dcc349f7d621f81e4b2599ee9218561a4 which is replaced with the upstream commit 53642399aa71 ("usb: gadget: f_fs: Fix wrong check on reserved1 of OS_DESC_EXT_COMPAT"). Change-Id: I34e0f68d1e54a1852d021ee3ef78e3944fea675f Signed-off-by: William Wu --- drivers/usb/gadget/function/f_fs.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 598e73089da6..10cbce848e56 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -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); }