diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-14 10:18:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-14 10:18:55 -0700 |
| commit | 118cb990cd66791e5ae86bfae22b8b9c64bd5fd9 (patch) | |
| tree | c3bda9c048d30895718bc28fa8f009f6a0356641 /drivers/usb/host/ohci-at91.c | |
| parent | ba8d400ec8b29d8783d5e11980084b6071f607f6 (diff) | |
| download | op-kernel-dev-118cb990cd66791e5ae86bfae22b8b9c64bd5fd9.zip op-kernel-dev-118cb990cd66791e5ae86bfae22b8b9c64bd5fd9.tar.gz | |
Revert "USB: OHCI: Properly handle ohci-at91 suspend"
This reverts commit 056ca85dab838bf064485b6cd73ddfcd9bf707e7.
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>
Diffstat (limited to 'drivers/usb/host/ohci-at91.c')
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index f2d8403..476b5a5 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -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) |
