android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: USB: gadget: f_fs.c: Fix merge issue

Browse Source 
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: 499df25c94 ("Merge 5.10.3 into android12-5.10")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I41a8809038e7638697955f82609bcb3aea0293fa
This commit is contained in:
Greg Kroah-Hartman 2020-12-27 13:23:49 +01:00
parent a7c33264f9
commit 8c1b0c9ace
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1327,7 +1327,6 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code,
struct usb_endpoint_descriptor desc1, *desc;
switch (epfile->ffs->gadget->speed) {
case USB_SPEED_SUPER_PLUS:
case USB_SPEED_SUPER:
case USB_SPEED_SUPER_PLUS:
desc_idx = 2;