From 1f0d5d7241b52204512e6aa21938f87f8ef08c9f Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 3 Apr 2008 11:35:26 -0400 Subject: [PATCH] --- yaml --- r: 93339 b: refs/heads/master c: 0d22f65515307c878ddd20b1305cce925ca9516c h: refs/heads/master i: 93337: abe9133ea653c7393ffae41428df1d8aed1c81b6 93335: b729ace48e18688a05715ab380d493ae455506e5 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-pci.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d41555c335a1..9f9ecc2567b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9063ff44f081a0297085952f6760dfe1f8ca840e +refs/heads/master: 0d22f65515307c878ddd20b1305cce925ca9516c diff --git a/trunk/drivers/usb/host/ohci-pci.c b/trunk/drivers/usb/host/ohci-pci.c index d0360f65ebd9..b0e2275755c8 100644 --- a/trunk/drivers/usb/host/ohci-pci.c +++ b/trunk/drivers/usb/host/ohci-pci.c @@ -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; }