Commit d2e3d2b3 authored by Majunath Goudar's avatar Majunath Goudar Committed by Greg Kroah-Hartman

USB: OHCI: Properly handle ohci-spear suspend

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

Calling explicitly the ohci_suspend() routine in
spear_ohci_hcd_drv_suspend() will ensure proper
handling of suspend scenario.
Signed-off-by: default avatarManjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14982e31
...@@ -129,20 +129,26 @@ static int spear_ohci_hcd_drv_remove(struct platform_device *pdev) ...@@ -129,20 +129,26 @@ static int spear_ohci_hcd_drv_remove(struct platform_device *pdev)
} }
#if defined(CONFIG_PM) #if defined(CONFIG_PM)
static int spear_ohci_hcd_drv_suspend(struct platform_device *dev, static int spear_ohci_hcd_drv_suspend(struct platform_device *pdev,
pm_message_t message) pm_message_t message)
{ {
struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd); struct ohci_hcd *ohci = hcd_to_ohci(hcd);
struct spear_ohci *sohci_p = to_spear_ohci(hcd); struct spear_ohci *sohci_p = to_spear_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;
clk_disable_unprepare(sohci_p->clk); clk_disable_unprepare(sohci_p->clk);
return 0; return ret;
} }
static int spear_ohci_hcd_drv_resume(struct platform_device *dev) static int spear_ohci_hcd_drv_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