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

Commit 9c6f55fc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dwc3: gadget: Don't queue USB request if pull up is getting disabled"

parents 310a5c30 6e65b88e

drivers/usb/dwc3/ep0.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, 
	int				ret;



	spin_lock_irqsave(&dwc->lock, flags);

	if (!dep->endpoint.desc) {

	if (!dep->endpoint.desc || !dwc->pullups_connected) {

		dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",

				dep->name);

		ret = -ESHUTDOWN;

drivers/usb/dwc3/gadget.c

+2 −3
Original line number Diff line number Diff line
@@ -1541,7 +1541,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req) 
{

	struct dwc3		*dwc = dep->dwc;



	if (!dep->endpoint.desc) {

	if (!dep->endpoint.desc || !dwc->pullups_connected) {

		dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",

				dep->name);

		return -ESHUTDOWN;
@@ -1985,6 +1985,7 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) 
		dwc->pullups_connected = true;

	} else {

		dwc3_gadget_disable_irq(dwc);

		dwc->pullups_connected = false;

		__dwc3_gadget_ep_disable(dwc->eps[0]);

		__dwc3_gadget_ep_disable(dwc->eps[1]);
@@ -2001,8 +2002,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) 


		if (dwc->has_hibernation && !suspend)

			reg &= ~DWC3_DCTL_KEEP_CONNECT;



		dwc->pullups_connected = false;

	}



	dwc3_writel(dwc->regs, DWC3_DCTL, reg);