evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: gadget: f_gsi: Fix alternate index returned by gsi_get_alt"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-26 14:48:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0b4cfe3827
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/usb/gadget/function/f_gsi.c
View file

@ -1727,7 +1727,10 @@ static int gsi_get_alt(struct usb_function *f, unsigned intf)
{ {
struct f_gsi *gsi = func_to_gsi(f); struct f_gsi *gsi = func_to_gsi(f);
if (intf == gsi->ctrl_id) /* RNDIS, RMNET and DPL only support alt 0*/
if (intf == gsi->ctrl_id || gsi->prot_id == IPA_USB_RNDIS ||
gsi->prot_id == IPA_USB_RMNET ||
gsi->prot_id == IPA_USB_DIAG)
return 0; return 0;
else if (intf == gsi->data_id) else if (intf == gsi->data_id)
return gsi->data_interface_up; return gsi->data_interface_up;