Skip to content

Commit

Permalink
USB: OHCI: fix bug in controller resume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Apr 25, 2008
1 parent 9063ff4 commit 0d22f65
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/usb/host/ohci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 0d22f65

Please sign in to comment.