From 69394fd5fd72db7293eaa3d9a96d2a31c38ebc1a Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 27 Oct 2006 10:35:01 -0400 Subject: [PATCH] --- yaml --- r: 41242 b: refs/heads/master c: 565402baee99096da4d79209e450fe42d379a0ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-hub.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4a18a1990b19..fee62ab8a35e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d7efe5b3768bf53df9b87380ea68baacf11f933 +refs/heads/master: 565402baee99096da4d79209e450fe42d379a0ca diff --git a/trunk/drivers/usb/host/ohci-hub.c b/trunk/drivers/usb/host/ohci-hub.c index 1e5ed3bb1a93..dcf9eb601328 100644 --- a/trunk/drivers/usb/host/ohci-hub.c +++ b/trunk/drivers/usb/host/ohci-hub.c @@ -204,18 +204,6 @@ __acquires(ohci->lock) goto skip_resume; spin_unlock_irq (&ohci->lock); - temp = ohci->num_ports; - while (temp--) { - u32 stat = ohci_readl (ohci, - &ohci->regs->roothub.portstatus [temp]); - - /* force global, not selective, resume */ - if (!(stat & RH_PS_PSS)) - continue; - ohci_writel (ohci, RH_PS_POCI, - &ohci->regs->roothub.portstatus [temp]); - } - /* Some controllers (lucent erratum) need extra-long delays */ msleep (20 /* usb 11.5.1.10 */ + 12 /* 32 msec counter */ + 1); @@ -223,6 +211,7 @@ __acquires(ohci->lock) temp &= OHCI_CTRL_HCFS; if (temp != OHCI_USB_RESUME) { ohci_err (ohci, "controller won't resume\n"); + spin_lock_irq(&ohci->lock); return -EBUSY; }