Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 93339
b: refs/heads/master
c: 0d22f65
h: refs/heads/master
i:
  93337: abe9133
  93335: b729ace
v: v3
  • Loading branch information
Alan Stern authored and Greg Kroah-Hartman committed Apr 25, 2008
1 parent 578b45d commit 1f0d5d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9063ff44f081a0297085952f6760dfe1f8ca840e
refs/heads/master: 0d22f65515307c878ddd20b1305cce925ca9516c
4 changes: 3 additions & 1 deletion trunk/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 1f0d5d7

Please sign in to comment.