[PATCH V2 02/11] USB: OHCI: Properly handle ohci-at91 suspend

Majunath Goudar csmanjuvijay at gmail.com
Thu Oct 3 09:02:04 EDT 2013

From: Manjunath Goudar <manjunath.goudar at linaro.org>

Suspend scenario in case of ohci-at91 glue was not properly handled
as it was not suspending generic part of ohci controller. Alan Stern
suggested, properly handle ohci-at91 suspend scenario.

Calling explicitly the ohci_suspend() routine in ohci_hcd_at91_drv_suspend()
will ensure proper handling of suspend scenario.

Signed-off-by: Manjunath Goudar <manju.goudar at lge.com>
Signed-off-by: Manjunath Goudar <csmanjuvijay at gmail.com>
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Arnd Bergmann <arnd at arndb.de>
Cc: Greg KH <greg at kroah.com>
Cc: linux-usb at vger.kernel.org
 drivers/usb/host/ohci-at91.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 476b5a5..13449cc 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -636,9 +636,11 @@ 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);
+	int		ret;
-	if (device_may_wakeup(&pdev->dev))
-		enable_irq_wake(hcd->irq);
+	ret = ohci_suspend(hcd);
+	if (ret)
+		return ret;
 	 * The integrated transceivers seem unable to notice disconnect,
@@ -658,7 +660,7 @@ ohci_hcd_at91_drv_suspend(struct platform_device *pdev, pm_message_t mesg)
-	return 0;
+	return ret;
 static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)

More information about the linux-arm-kernel mailing list