|
@@ -431,16 +431,23 @@ static int ohci_hcd_omap_drv_remove(struct platform_device *dev)
|
|
|
|
|
|
#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))
|
|
|
msleep(5);
|
|
|
ohci->next_statechange = jiffies;
|
|
|
|
|
|
+ ret = ohci_suspend(hcd, do_wakeup);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
omap_ohci_clock_power(0);
|
|
|
- return 0;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static int ohci_omap_resume(struct platform_device *dev)
|