summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorManjunath Goudar <manjunath.goudar@linaro.org>2013-10-04 06:28:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-06 02:56:41 +0200
commit018258b4360b99b41c50ece917111f138e2314e7 (patch)
tree4343d3a645b6ecb61e238f6f1e0828c78355d190 /drivers/usb/host
parentUSB: OHCI: Properly handle ohci-da8xx suspend (diff)
downloadlinux-018258b4360b99b41c50ece917111f138e2314e7.tar.xz
linux-018258b4360b99b41c50ece917111f138e2314e7.zip
USB: OHCI: Properly handle ohci-ep93xx suspend
Suspend scenario in case of ohci-ep93xx glue was not properly handled as it was not suspending generic part of ohci controller. Alan Stern suggested, properly handle ohci-ep93xx suspend scenario. Calling explicitly the ohci_suspend() routine in ohci_hcd_ep93xx_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>
Diffstat (limited to '')
-rw-r--r--drivers/usb/host/ohci-ep93xx.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 492f681c70f2..08409bfa1cde 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -112,13 +112,20 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_
{
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;
- clk_disable(usb_host_clock);
- return 0;
+ ret = ohci_suspend(hcd, do_wakeup);
+ if (ret)
+ return ret;
+
+ ep93xx_stop_hc(&pdev->dev);
+
+ return ret;
}
static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)