]> git.karo-electronics.de Git - linux-beck.git/commitdiff
USB: OHCI: Properly handle ohci-pxa27x suspend
authorManjunath Goudar <manjunath.goudar@linaro.org>
Fri, 4 Oct 2013 04:28:15 +0000 (09:58 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 6 Oct 2013 00:56:41 +0000 (17:56 -0700)
Suspend scenario in case of ohci-pxa27x glue was not
properly handled as it was not suspending generic part
of ohci controller.  Alan Stern suggested, properly
handle ohci-pxa27x suspend scenario.

Calling explicitly the ohci_suspend() routine in
ohci_hcd_pxa27x_drv_suspend() will ensure proper
handling of suspend scenario.

Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org>
Signed-off-by: Manjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-pxa27x.c

index c1b1fa3047be992b47cdad2b58b5ebe83489d12a..deea5d1d6394f3015de6a8a728061a0d3cfedc5a 100644 (file)
@@ -509,13 +509,20 @@ static int ohci_hcd_pxa27x_drv_suspend(struct device *dev)
        struct usb_hcd *hcd = dev_get_drvdata(dev);
        struct pxa27x_ohci *pxa_ohci = to_pxa27x_ohci(hcd);
        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+       bool do_wakeup = device_may_wakeup(dev);
+       int ret;
+
 
        if (time_before(jiffies, ohci->next_statechange))
                msleep(5);
        ohci->next_statechange = jiffies;
 
+       ret = ohci_suspend(hcd, do_wakeup);
+       if (ret)
+               return ret;
+
        pxa27x_stop_hc(pxa_ohci, dev);
-       return 0;
+       return ret;
 }
 
 static int ohci_hcd_pxa27x_drv_resume(struct device *dev)