summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-11-19 00:06:00 +0100
committerFelipe Balbi <balbi@ti.com>2015-11-19 21:48:35 +0100
commit391e6dcb37857d5659b53def2f41e2f56850d33c (patch)
treeb08adef60acf86153c1c4dd61b17c3bcb5a75147 /drivers/usb/gadget
parentusb: gadget: functionfs: fix missing access_ok checks (diff)
downloadlinux-391e6dcb37857d5659b53def2f41e2f56850d33c.tar.xz
linux-391e6dcb37857d5659b53def2f41e2f56850d33c.zip
usb: gadget: pxa27x: fix suspend callback
pxa27x disconnects pullups on suspend but doesn't notify the gadget driver about it, so gadget driver can't disable the endpoints it was using. This causes problems on resume because gadget core will think endpoints are still enabled and just ignore the following usb_ep_enable(). Fix this problem by calling gadget_driver->disconnect(). Cc: <stable@vger.kernel.org> # v3.10+ Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/udc/pxa27x_udc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index 670ac0b12f00..001a3b74a993 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -2536,6 +2536,9 @@ static int pxa_udc_suspend(struct platform_device *_dev, pm_message_t state)
udc->pullup_resume = udc->pullup_on;
dplus_pullup(udc, 0);
+ if (udc->driver)
+ udc->driver->disconnect(&udc->gadget);
+
return 0;
}