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

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

Merge "usb: dwc3: Do not initiate remote wakeup from core layer"

parents 1dc2d12b 67dabde8

drivers/usb/dwc3/gadget.c

+0 −16
Original line number Diff line number Diff line
@@ -350,8 +350,6 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param) 
	return ret;

}



static int __dwc3_gadget_wakeup(struct dwc3 *dwc);



/**

 * dwc3_send_gadget_ep_cmd - issue an endpoint command

 * @dep: the endpoint to which the command is going to be issued
@@ -399,20 +397,6 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, 
			dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);

	}



	if (DWC3_DEPCMD_CMD(cmd) == DWC3_DEPCMD_STARTTRANSFER) {

		int		needs_wakeup;



		needs_wakeup = (dwc->link_state == DWC3_LINK_STATE_U1 ||

				dwc->link_state == DWC3_LINK_STATE_U2 ||

				dwc->link_state == DWC3_LINK_STATE_U3);



		if (unlikely(needs_wakeup)) {

			ret = __dwc3_gadget_wakeup(dwc);

			dev_WARN_ONCE(dwc->dev, ret, "wakeup failed --> %d\n",

					ret);

		}

	}



	dwc3_writel(dep->regs, DWC3_DEPCMDPAR0, params->param0);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR1, params->param1);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR2, params->param2);