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

This reverts commit 056ca85dab.

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>
This commit is contained in:
Greg Kroah-Hartman 2013-10-14 10:18:55 -07:00
parent ba8d400ec8
commit 118cb990cd

View file

@ -636,14 +636,8 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg)
{
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;
ret = ohci_suspend(hcd, do_wakeup);
if (ret)
return ret;
if (do_wakeup)
if (device_may_wakeup(&pdev->dev))
enable_irq_wake(hcd->irq);
/*
@ -664,7 +658,7 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg)
at91_stop_clock();
}
return ret;
return 0;
}
static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)