summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ohci-exynos.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2012-02-23 17:26:33 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-24 13:40:04 -0800
commit2b4ffe31a2380de7c893e345659b0730d6dc62d3 (patch)
treeeae1fc38bf6de0a3e05db483f35a0e0f11eebd46 /drivers/usb/host/ohci-exynos.c
parent8c1b369394d188afb954ef470d90ac887438530c (diff)
downloadop-kernel-dev-2b4ffe31a2380de7c893e345659b0730d6dc62d3.zip
op-kernel-dev-2b4ffe31a2380de7c893e345659b0730d6dc62d3.tar.gz
USB: ohci-exynos: replace hcd->state with ohci->rh_state
This patch removes uses of hcd->state and replaces hcd->state with ohci->rh_state field. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ohci-exynos.c')
-rw-r--r--drivers/usb/host/ohci-exynos.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 55aa35a..37bb20e 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -212,12 +212,10 @@ static int exynos_ohci_suspend(struct device *dev)
* mark HW unaccessible, bail out if RH has been resumed. Use
* the spinlock to properly synchronize with possible pending
* RH suspend or resume activity.
- *
- * This is still racy as hcd->state is manipulated outside of
- * any locks =P But that will be a different fix.
*/
spin_lock_irqsave(&ohci->lock, flags);
- if (hcd->state != HC_STATE_SUSPENDED && hcd->state != HC_STATE_HALT) {
+ if (ohci->rh_state != OHCI_RH_SUSPENDED &&
+ ohci->rh_state != OHCI_RH_HALTED) {
rc = -EINVAL;
goto fail;
}
OpenPOWER on IntegriCloud