1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 91ec9b2cd378..9897d70e4c15 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -191,23 +191,14 @@ static int exynos_ohci_suspend(struct device *dev)
         struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd);
         struct ohci_hcd *ohci = hcd_to_ohci(hcd);
         struct platform_device *pdev = to_platform_device(dev);
+        bool do_wakeup = device_may_wakeup(dev);
         unsigned long flags;
-        int rc = 0;
+        int rc = ohci_suspend(hcd, do_wakeup);
 
-        /*
-         * 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 &&
-                        ohci->rh_state != OHCI_RH_HALTED) {
-                rc = -EINVAL;
-                goto fail;
-        }
+        if (rc)
+                return rc;
 
-        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+        spin_lock_irqsave(&ohci->lock, flags);
 
         if (exynos_ohci->otg)
                 exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self);
@@ -216,10 +207,9 @@ static int exynos_ohci_suspend(struct device *dev)
 
         clk_disable_unprepare(exynos_ohci->clk);
 
-fail:
         spin_unlock_irqrestore(&ohci->lock, flags);
 
-        return rc;
+        return 0;
 }
 
 static int exynos_ohci_resume(struct device *dev)