---

yaml --- r: 317013 b: refs/heads/master c: 631fe9d h: refs/heads/master i: 317011: 6239d35 v: v3
git-mirror · Jul 16, 2012 · a3aa0f8 · a3aa0f8
1 parent 756ba27
commit a3aa0f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f9be64a6de34f8d4a2dce845af15063523a02e3
+refs/heads/master: 631fe9d9d20e28fffdf750d12dd2cd275bd654e9
diff --git a/trunk/drivers/usb/host/ehci-hcd.c b/trunk/drivers/usb/host/ehci-hcd.c
@@ -823,12 +823,12 @@ static int ehci_setup(struct usb_hcd *hcd)
 
 	ehci->sbrn = HCD_USB2;
 
-	retval = ehci_halt(ehci);
+	/* data structure init */
+	retval = ehci_init(hcd);
 	if (retval)
 		return retval;
 
-	/* data structure init */
-	retval = ehci_init(hcd);
+	retval = ehci_halt(ehci);
 	if (retval)
 		return retval;