Commit 0d22f655 authored Apr 03, 2008 by Alan Stern Committed by Greg Kroah-Hartman Apr 24, 2008

USB: OHCI: fix bug in controller resume



This patch (as1063) fixes a bug in the way ohci-hcd resumes its
controllers.  It leaves the Master Interrupt Enable bit turned off.

If the root hub is resumed immediately this won't matter.  But if the
root hub is suspended (say because no devices are plugged in), it won't
ever wake up by itself.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 9063ff44

drivers/usb/host/ohci-pci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -312,11 +312,13 @@ static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message)

		static int ohci_pci_resume (struct usb_hcd *hcd)
		{
		struct ohci_hcd *ohci = hcd_to_ohci(hcd);

		set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);

		/* FIXME: we should try to detect loss of VBUS power here */
		prepare_for_handover(hcd);

		ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrenable);
		return 0;
		}