Skip to content

Commit

Permalink
USB: OHCI: Properly handle ohci-exynos suspend
Browse files Browse the repository at this point in the history
Suspend scenario in case of ohci-exynos glue was not
properly handled as it was not suspending generic part
of ohci controller. Alan Stern suggested, properly handle
ohci-exynos suspend scenario.

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

Signed-off-by: Manjunath Goudar <csmanjuvijay@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Majunath Goudar authored and Greg Kroah-Hartman committed Dec 9, 2013
1 parent 933bb1f commit 14982e3
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions drivers/usb/host/ohci-exynos.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit 14982e3

Please sign in to comment.