summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2016-04-12 11:33:29 +0300
committerFelipe Balbi <felipe.balbi@linux.intel.com>2016-04-18 12:35:18 +0300
commit9772b47a4c2916d645c551228b6085ea24acbe5d (patch)
tree0517e1fc9865c2a009404c182bcac4fe4fe544f4
parente6bdf8195b4a43ebff71f25fc7ca5e436e79161a (diff)
downloadop-kernel-dev-9772b47a4c2916d645c551228b6085ea24acbe5d.zip
op-kernel-dev-9772b47a4c2916d645c551228b6085ea24acbe5d.tar.gz
usb: dwc3: gadget: Fix suspend/resume during device mode
Gadget controller might not be always active during system suspend/resume as gadget driver might not have yet been loaded or might have been unloaded prior to system suspend. Check if we're active and only then perform necessary actions during suspend/resume. Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
-rw-r--r--drivers/usb/dwc3/gadget.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index d54a028..8e4a1b1 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2936,6 +2936,9 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
int dwc3_gadget_suspend(struct dwc3 *dwc)
{
+ if (!dwc->gadget_driver)
+ return 0;
+
if (dwc->pullups_connected) {
dwc3_gadget_disable_irq(dwc);
dwc3_gadget_run_stop(dwc, true, true);
@@ -2954,6 +2957,9 @@ int dwc3_gadget_resume(struct dwc3 *dwc)
struct dwc3_ep *dep;
int ret;
+ if (!dwc->gadget_driver)
+ return 0;
+
/* Start with SuperSpeed Default */
dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
OpenPOWER on IntegriCloud