[PATCH V4 05/11] USB: OHCI: Properly handle ohci-ep93xx suspend

Manjunath Goudar manjunath.goudar at linaro.org
Thu Jun 20 05:36:01 EDT 2013

Suspend scenario in case of ohci-ep93xx glue was not
properly handled as it was not suspending generic part
of ohci controller. Calling explicitly the ohci_suspend()
routine in ohci_hcd_ep93xx_drv_suspend() will ensure proper
handling of suspend scenario.

Signed-off-by: Manjunath Goudar <manjunath.goudar at linaro.org>
Cc: Arnd Bergmann <arnd at arndb.de>
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: Greg KH <greg at kroah.com>
Cc: linux-usb at vger.kernel.org

 -Incase ohci_suspend() fails, return right away without
  executing further.
 -Aligned variable "do_wakeup" and "ret".
 -The do_wakeup and ret variable alignment is removed.
 drivers/usb/host/ohci-ep93xx.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 8704e9f..f0aaa48 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -174,13 +174,20 @@ 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))
 	ohci->next_statechange = jiffies;
+	ret = ohci_suspend(hcd, do_wakeup);
+	if (ret)
+		return ret;
-	return 0;
+	return ret;
 static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)

More information about the linux-arm-kernel mailing list