Skip to content

Commit 0d22f65

Browse files
AlanSterngregkh
authored andcommitted
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 <[email protected]> CC: David Brownell <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9063ff4 commit 0d22f65

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/usb/host/ohci-pci.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,13 @@ static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message)
312312

313313
static int ohci_pci_resume (struct usb_hcd *hcd)
314314
{
315+
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
316+
315317
set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
316318

317319
/* FIXME: we should try to detect loss of VBUS power here */
318320
prepare_for_handover(hcd);
319-
321+
ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrenable);
320322
return 0;
321323
}
322324

0 commit comments

Comments
 (0)