USB: OHCI: Properly handle ohci-s3c2410 suspend

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

Calling explicitly the ohci_suspend()
routine in ohci_hcd_s3c2410_drv_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>

diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index be3429e08d909a58b3b2d3fb9923ca592d4eabc4..b5bf9b7a54fc9c88998ea209a4c95c443164ae50 100644 (file)
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -426,28 +426,15 @@ static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
 static int ohci_hcd_s3c2410_drv_suspend(struct device *dev)
 {
        struct usb_hcd *hcd = dev_get_drvdata(dev);
-       struct ohci_hcd *ohci = hcd_to_ohci(hcd);
        struct platform_device *pdev = to_platform_device(dev);
-       unsigned long flags;
+       bool do_wakeup = device_may_wakeup(dev);
        int rc = 0;
 
-       /*
-        * Root hub was already suspended. Disable irq emission and
-        * mark HW unaccessible, bail out if RH has been resumed. Use
-        * the spinlock to properly synchronize with possible pending
-        * RH suspend or resume activity.
-        */
-       spin_lock_irqsave(&ohci->lock, flags);
-       if (ohci->rh_state != OHCI_RH_SUSPENDED) {
-               rc = -EINVAL;
-               goto bail;
-       }
-
-       clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+       rc = ohci_suspend(hcd, do_wakeup);
+       if (rc)
+               return rc;
 
        s3c2410_stop_hc(pdev);
-bail:
-       spin_unlock_irqrestore(&ohci->lock, flags);
 
        return rc;
 }