AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

USB: OHCI: remove stale testing code from root-hub resume

Browse Source 
This patch (as811) removes some stale testing code from the root-hub
resume routine in ohci-hcd.  It also adds a spin_lock_irq() call that
inadvertently got left out of an error pathway.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2006-10-27 10:35:01 -04:00 committed by Greg Kroah-Hartman
parent 5d7efe5b37
commit 565402baee
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/host/ohci-hub.c
View File

@ -204,18 +204,6 @@ __acquires(ohci->lock)
goto skip_resume; goto skip_resume;
spin_unlock_irq (&ohci->lock); 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 */ /* Some controllers (lucent erratum) need extra-long delays */
msleep (20 /* usb 11.5.1.10 */ + 12 /* 32 msec counter */ + 1); msleep (20 /* usb 11.5.1.10 */ + 12 /* 32 msec counter */ + 1);
@ -223,6 +211,7 @@ __acquires(ohci->lock)
temp &= OHCI_CTRL_HCFS; temp &= OHCI_CTRL_HCFS;
if (temp != OHCI_USB_RESUME) { if (temp != OHCI_USB_RESUME) {
ohci_err (ohci, "controller won't resume\n"); ohci_err (ohci, "controller won't resume\n");
spin_lock_irq(&ohci->lock);
return -EBUSY; return -EBUSY;
} }