Commit 10abfa13 authored by Manjunath Goudar's avatar Manjunath Goudar Committed by Greg Kroah-Hartman

USB: OHCI: Properly handle ohci-omap suspend

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

Calling explicitly the ohci_suspend() routine in
ohci_omap_suspend() will ensure proper handling of suspend
scenario.
Signed-off-by: default avatarManjunath Goudar <manjunath.goudar@linaro.org>
Signed-off-by: default avatarManjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fea0896f
...@@ -431,16 +431,23 @@ static int ohci_hcd_omap_drv_remove(struct platform_device *dev) ...@@ -431,16 +431,23 @@ static int ohci_hcd_omap_drv_remove(struct platform_device *dev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ohci_omap_suspend(struct platform_device *dev, pm_message_t message) static int ohci_omap_suspend(struct platform_device *pdev, pm_message_t message)
{ {
struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(dev)); 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)) if (time_before(jiffies, ohci->next_statechange))
msleep(5); msleep(5);
ohci->next_statechange = jiffies; ohci->next_statechange = jiffies;
ret = ohci_suspend(hcd, do_wakeup);
if (ret)
return ret;
omap_ohci_clock_power(0); omap_ohci_clock_power(0);
return 0; return ret;
} }
static int ohci_omap_resume(struct platform_device *dev) static int ohci_omap_resume(struct platform_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment