]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
USB: OHCI: Properly handle ohci-da8xx suspend
authorManjunath Goudar <manjunath.goudar@linaro.org>
Fri, 4 Oct 2013 04:28:10 +0000 (09:58 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 6 Oct 2013 00:56:41 +0000 (17:56 -0700)
Suspend scenario in case of ohci-da8xx glue was not
properly handled as it was not suspending generic part
of ohci controller. Alan Stern suggested, properly handle
ohci-da8xx suspend scenario.

Calling explicitly the ohci_suspend()
routine in ohci_da8xx_suspend() will ensure proper
handling of suspend scenario.

Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org>
Signed-off-by: Manjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-da8xx.c

index 9be59f11e05101356c2b2e44b6b59c3cc7af88be..f8238a41c98cb586aaa5b0e2cca5486857fca51e 100644 (file)
@@ -406,19 +406,26 @@ static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev)
 }
 
 #ifdef CONFIG_PM
-static int ohci_da8xx_suspend(struct platform_device *dev, pm_message_t message)
+static int ohci_da8xx_suspend(struct platform_device *pdev,
+                               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);
+       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;
+
        ohci_da8xx_clock(0);
        hcd->state = HC_STATE_SUSPENDED;
-       dev->dev.power.power_state = PMSG_SUSPEND;
-       return 0;
+
+       return ret;
 }
 
 static int ohci_da8xx_resume(struct platform_device *dev)