Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (c972398b) · Commits · e / devices / android_kernel_teracube_2e

drivers/usb/host/ohci-hub.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,6 +132,8 @@ static inline struct ed find_head (struct ed ed)
		return ed;
		}

		static int ohci_restart (struct ohci_hcd *ohci);

		/* caller has locked the root hub */
		static int ohci_rh_resume (struct ohci_hcd *ohci)
		__releases(ohci->lock)
		@@ -181,8 +183,6 @@ __acquires(ohci->lock)
		#ifdef CONFIG_PM
		if (status == -EBUSY) {
		if (!autostopped) {
		static int ohci_restart (struct ohci_hcd *ohci);

		spin_unlock_irq (&ohci->lock);
		(void) ohci_init (ohci);
		status = ohci_restart (ohci);