Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ef20b4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: gadget: Unconfigure bam2bam endpoints during suspend"

parents 32c0e9a7 24ad0631

drivers/usb/dwc3/dwc3-msm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1419,7 +1419,7 @@ int msm_ep_unconfig(struct usb_ep *ep) 




	/* Restore original ep ops */

	/* Restore original ep ops */

	if (!mdwc->original_ep_ops[dep->number]) {

	if (!mdwc->original_ep_ops[dep->number]) {

		dev_err(mdwc->dev,

		dev_dbg(mdwc->dev,

			"ep [%s,%d] was not configured as msm endpoint\n",

			"ep [%s,%d] was not configured as msm endpoint\n",

			ep->name, dep->number);

			ep->name, dep->number);

		return -EINVAL;

		return -EINVAL;

drivers/usb/gadget/function/f_qc_rndis.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -823,6 +823,11 @@ static void rndis_qc_suspend(struct usb_function *f) 
		 */

		 */

		rndis_flow_control(rndis->config, true);

		rndis_flow_control(rndis->config, true);

		pr_debug("%s(): Disconnecting\n", __func__);

		pr_debug("%s(): Disconnecting\n", __func__);

		if (rndis->xport == USB_GADGET_XPORT_BAM2BAM_IPA &&

			gadget_is_dwc3(f->config->cdev->gadget)) {

			msm_ep_unconfig(rndis->port.out_ep);

			msm_ep_unconfig(rndis->port.in_ep);

		}

	}

	}





	bam_data_suspend(&rndis->bam_port, rndis->port_num, USB_FUNC_RNDIS,

	bam_data_suspend(&rndis->bam_port, rndis->port_num, USB_FUNC_RNDIS,

drivers/usb/gadget/function/f_rmnet.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -624,6 +624,10 @@ static void frmnet_suspend(struct usb_function *f) 
			pr_debug("in_ep_desc_bkup = %p, out_ep_desc_bkup = %p",

			pr_debug("in_ep_desc_bkup = %p, out_ep_desc_bkup = %p",

			       dev->in_ep_desc_backup, dev->out_ep_desc_backup);

			       dev->in_ep_desc_backup, dev->out_ep_desc_backup);

			pr_debug("%s(): Disconnecting\n", __func__);

			pr_debug("%s(): Disconnecting\n", __func__);

			if (gadget_is_dwc3(f->config->cdev->gadget)) {

				msm_ep_unconfig(dev->port.out);

				msm_ep_unconfig(dev->port.in);

			}

			gport_rmnet_disconnect(dev);

			gport_rmnet_disconnect(dev);

		}

		}

		break;

		break;