From a3aa0f843a5b4fe3dc89bcdb38118fe05462014b Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 11 Jul 2012 11:21:09 -0400
Subject: [PATCH] --- yaml --- r: 317013 b: refs/heads/master c:
 631fe9d9d20e28fffdf750d12dd2cd275bd654e9 h: refs/heads/master i:   317011:
 6239d35175d3faeb815523ef9861223c47273fea v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/ehci-hcd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c2399ce0d35e..a56c86a13e09 100644
--- 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
index f9a783bfa1fe..8727f4ea343f 100644
--- 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;