aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-14 13:18:10 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-14 13:18:10 -0400
commit848b5b5e06ffbdbda786c68ffd4a8f84edc8be9c (patch)
treee0723ff89db2baded17a4acffc8bb5d81892205e
parent066ba8e0617754f47b7bec068ebe6789f8c6cac6 (diff)
Revert "USB: OHCI: Properly handle ohci-ep93xx suspend"
This reverts commit 018258b4360b99b41c50ece917111f138e2314e7. Manjunath is no longer at Linaro, the email address bounces. Given that, and the fact that others have reported problems with these patches, I'm reverting them until someone from Linaro who can SUPPORT THEM submits them. I will no longer accept patches from linaro.com developers unless a senior Linaro developer has signed off on them, which did not happen with this patch set. Reported-by: Olof Johansson <olof@lixom.net> Cc: Manjunath Goudar <manjunath.goudar@linaro.org> Cc: Manjunath Goudar <csmanjuvijay@gmail.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--drivers/usb/host/ohci-ep93xx.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 08409bfa1cde..492f681c70f2 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -112,20 +112,13 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_
112{ 112{
113 struct usb_hcd *hcd = platform_get_drvdata(pdev); 113 struct usb_hcd *hcd = platform_get_drvdata(pdev);
114 struct ohci_hcd *ohci = hcd_to_ohci(hcd); 114 struct ohci_hcd *ohci = hcd_to_ohci(hcd);
115 bool do_wakeup = device_may_wakeup(&pdev->dev);
116 int ret;
117 115
118 if (time_before(jiffies, ohci->next_statechange)) 116 if (time_before(jiffies, ohci->next_statechange))
119 msleep(5); 117 msleep(5);
120 ohci->next_statechange = jiffies; 118 ohci->next_statechange = jiffies;
121 119
122 ret = ohci_suspend(hcd, do_wakeup); 120 clk_disable(usb_host_clock);
123 if (ret) 121 return 0;
124 return ret;
125
126 ep93xx_stop_hc(&pdev->dev);
127
128 return ret;
129} 122}
130 123
131static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev) 124static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)