USB: EHCI: initialize data before resetting hardware

Currently, EHCI initialization turns off the controller (in case it
was left running by the firmware) before setting up the ehci_hcd data
structure.  This patch (as1565) reverses that order.

Although it doesn't matter now, it will matter later on when future
additions to ehci_halt() will want to acquire a spinlock that gets
initialized by ehci_init().

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index f9a783bfa1fe..8727f4ea343f 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/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;