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>
This commit is contained in:
Alan Stern 2012-07-11 11:21:09 -04:00 committed by Greg Kroah-Hartman
parent 1f9be64a6d
commit 631fe9d9d2
1 changed files with 3 additions and 3 deletions

View File

@ -823,12 +823,12 @@ static int ehci_setup(struct usb_hcd *hcd)
ehci->sbrn = HCD_USB2; ehci->sbrn = HCD_USB2;
retval = ehci_halt(ehci); /* data structure init */
retval = ehci_init(hcd);
if (retval) if (retval)
return retval; return retval;
/* data structure init */ retval = ehci_halt(ehci);
retval = ehci_init(hcd);
if (retval) if (retval)
return retval; return retval;