Commit 631fe9d9 authored Jul 11, 2012 by Alan Stern Committed by Greg Kroah-Hartman Jul 16, 2012

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>

parent 1f9be64a

drivers/usb/host/ehci-hcd.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;