---

yaml --- r: 289471 b: refs/heads/master c: 2b4ffe3 h: refs/heads/master i: 289469: eedba60 289467: 1d10bc1 289463: 72cd4ce 289455: 1fbf229 289439: 02cb5b4 289407: 66dd28d v: v3
git-mirror · Feb 24, 2012 · 504d920 · 504d920
1 parent b0d5d8b
commit 504d920
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c1b369394d188afb954ef470d90ac887438530c
+refs/heads/master: 2b4ffe31a2380de7c893e345659b0730d6dc62d3
diff --git a/trunk/drivers/usb/host/ohci-exynos.c b/trunk/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;
 	}