]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: gadget: pxa27x: fix suspend callback
authorFelipe Balbi <balbi@ti.com>
Wed, 18 Nov 2015 23:06:00 +0000 (17:06 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 11 Jan 2016 10:50:15 +0000 (10:50 +0000)
commit 391e6dcb37857d5659b53def2f41e2f56850d33c upstream.

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().

Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Felipe Balbi <balbi@ti.com>
[ luis: backported to 3.16:
  - file rename: drivers/usb/gadget/udc/pxa27x_udc.c ->
    drivers/usb/gadget/pxa27x_udc.c ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/usb/gadget/pxa27x_udc.c

index cdf4d678be9638c1edaa230760b487740a5f0bf6..a63dee15bdc7190bd141b7e0c809b7aa88b09ec2 100644 (file)
@@ -2558,6 +2558,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;
 }