diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-14 21:18:10 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-14 21:18:10 +0400 |
| commit | 848b5b5e06ffbdbda786c68ffd4a8f84edc8be9c (patch) | |
| tree | e0723ff89db2baded17a4acffc8bb5d81892205e | |
| parent | 066ba8e0617754f47b7bec068ebe6789f8c6cac6 (diff) | |
| download | linux-848b5b5e06ffbdbda786c68ffd4a8f84edc8be9c.tar.xz | |
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.c | 11 |
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_ { 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; - - ep93xx_stop_hc(&pdev->dev); - - return ret; + clk_disable(usb_host_clock); + return 0; } static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev) |