]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
USB: OHCI: Properly handle ohci-omap suspend
authorManjunath Goudar <manjunath.goudar@linaro.org>
Fri, 4 Oct 2013 04:28:13 +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-omap glue was not
properly handled as it was not suspending generic part
of ohci controller. Alan Stern suggested, properly handle
ohci-omap suspend scenario.

Calling explicitly the ohci_suspend() routine in
ohci_omap_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-omap.c

index 18b27a27e7dc6aee1560c91a25aa9534f2a3792d..f253214741ba014c35e28fa498894f8c5cac7847 100644 (file)
@@ -431,16 +431,23 @@ static int ohci_hcd_omap_drv_remove(struct platform_device *dev)
 
 #ifdef CONFIG_PM
 
-static int ohci_omap_suspend(struct platform_device *dev, pm_message_t message)
+static int ohci_omap_suspend(struct platform_device *pdev, pm_message_t message)
 {
-       struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev));
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+       struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+       bool do_wakeup = device_may_wakeup(&pdev->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;
+
        omap_ohci_clock_power(0);
-       return 0;
+       return ret;
 }
 
 static int ohci_omap_resume(struct platform_device *dev)