Commit 848b5b5e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "USB: OHCI: Properly handle ohci-ep93xx suspend"

This reverts commit 018258b4.

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: default avatarOlof 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>
parent 066ba8e0
...@@ -112,20 +112,13 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_ ...@@ -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 usb_hcd *hcd = platform_get_drvdata(pdev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd); 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)) if (time_before(jiffies, ohci->next_statechange))
msleep(5); msleep(5);
ohci->next_statechange = jiffies; ohci->next_statechange = jiffies;
ret = ohci_suspend(hcd, do_wakeup); clk_disable(usb_host_clock);
if (ret) return 0;
return ret;
ep93xx_stop_hc(&pdev->dev);
return ret;
} }
static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev) static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment