diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-26 14:48:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-26 14:48:46 -0700 |
| commit | 0b4cfe38273aa52be4a940fe79a30ddeea47951d (patch) | |
| tree | 78c17cc84e4ab96a6edb22b8129f1d7ed9c53f4d /drivers/usb/gadget/function | |
| parent | 05966eaccacafc842810db143296a7dd6e13e5c9 (diff) | |
| parent | 98aecd6043427a2fd58608b36d18f6b53d8c4029 (diff) | |
Merge "usb: gadget: f_gsi: Fix alternate index returned by gsi_get_alt"
Diffstat (limited to 'drivers/usb/gadget/function')
| -rw-r--r-- | drivers/usb/gadget/function/f_gsi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_gsi.c b/drivers/usb/gadget/function/f_gsi.c index b953c6489999..e32348d17b26 100644 --- a/drivers/usb/gadget/function/f_gsi.c +++ b/drivers/usb/gadget/function/f_gsi.c @@ -1727,7 +1727,10 @@ static int gsi_get_alt(struct usb_function *f, unsigned intf) { 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; else if (intf == gsi->data_id) return gsi->data_interface_up; |