aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2020-12-27 06:23:49 -0600
committerGreg Kroah-Hartman2020-12-27 06:23:49 -0600
commit8c1b0c9acefe044aa53631be8635cd3b7661203b (patch)
treee31b971973c53a23cf71b5fe06c5bd40e8fb94f3
parenta7c33264f9d5fd9523842ef2faddbe32e931a003 (diff)
downloadkernel-8c1b0c9acefe044aa53631be8635cd3b7661203b.tar.gz
kernel-8c1b0c9acefe044aa53631be8635cd3b7661203b.tar.xz
kernel-8c1b0c9acefe044aa53631be8635cd3b7661203b.zip
ANDROID: USB: gadget: f_fs.c: Fix merge issue
The merge of 5.10.3 into android12-5.10 caused a build issue in the f_fs.c file due to an upstream patch being accepted that was a bit different from what was applied to the tree earlier. Fixes: 499df25c94d7 ("Merge 5.10.3 into android12-5.10") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I41a8809038e7638697955f82609bcb3aea0293fa
-rw-r--r--drivers/usb/gadget/function/f_fs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index cd18c4e2dbd8..c045a16ab05d 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1327,7 +1327,6 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code,
1327 struct usb_endpoint_descriptor desc1, *desc; 1327 struct usb_endpoint_descriptor desc1, *desc;
1328 1328
1329 switch (epfile->ffs->gadget->speed) { 1329 switch (epfile->ffs->gadget->speed) {
1330 case USB_SPEED_SUPER_PLUS:
1331 case USB_SPEED_SUPER: 1330 case USB_SPEED_SUPER:
1332 case USB_SPEED_SUPER_PLUS: 1331 case USB_SPEED_SUPER_PLUS:
1333 desc_idx = 2; 1332 desc_idx = 2;