[08/11] USB: OHCI: Properly handle ohci-platform suspend

Message ID 1374485566-3997-9-git-send-email-manjunath.goudar@linaro.org
State New
Headers show

Commit Message

manjunath.goudar@linaro.org July 22, 2013, 9:32 a.m.
Suspend scenario in case of ohci-platform glue was not
properly handled as it was not suspending generic part
of ohci controller. Calling explicitly the ohci_suspend()
routine in ohci_platform_suspend() will ensure proper
handling of suspend scenario.

Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg KH <greg@kroah.com>
Cc: linux-usb@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-platform.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index bc30475..b4a8784 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -139,14 +139,21 @@  static int ohci_platform_remove(struct platform_device *dev)
 static int ohci_platform_suspend(struct device *dev)
+	struct usb_hcd *hcd = dev_get_drvdata(dev);
 	struct usb_ohci_pdata *pdata = dev->platform_data;
 	struct platform_device *pdev =
 		container_of(dev, struct platform_device, dev);
+	bool do_wakeup = device_may_wakeup(dev);
+	int ret;
+	ret = ohci_suspend(hcd, do_wakeup);
+	if (ret)
+		return ret;
 	if (pdata->power_suspend)
-	return 0;
+	return ret;
 static int ohci_platform_resume(struct device *dev)