Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 11:53:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge "usb: gadget: qc_ecm: allow for calling set_alt(1) twice"

Browse source
This commit is contained in:
Linux Build Service Account 2014-10-20 12:50:24 -07:00 committed by Gerrit - the friendly Code Review server
parent 8a79d802b6 ef6a6cf54a
commit bd217783ce
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/gadget/f_qc_ecm.c
View file

@ -652,8 +652,17 @@ static int ecm_qc_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
* we can disconnect the port from the network layer.
*/
ecm_qc_bam_disconnect(ecm);
if (ecm->xport != USB_GADGET_XPORT_BAM2BAM_IPA)
if (ecm->xport != USB_GADGET_XPORT_BAM2BAM_IPA) {
gether_qc_disconnect_name(&ecm->port, "ecm0");
} else if (alt == 1 && gadget_is_dwc3(cdev->gadget)) {
if (msm_ep_unconfig(ecm->port.in_ep) ||
msm_ep_unconfig(ecm->port.out_ep)) {
pr_err("%s: ep_unconfig failed\n",
__func__);
goto fail;
}
}
}
if (!ecm->port.in_ep->desc ||