aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2005-09-05 13:55:23 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-12 12:23:39 -0700
commitf1a15606d5be8490a122f1c94c554bd0f07d8d26 (patch)
tree708f2b6be8c5c5ba0db53f7a8c583562f94df6ad
parentf7214ff4e8248513ec626212b2c1a3ca0b2a0888 (diff)
downloadlinux-linaro-f1a15606d5be8490a122f1c94c554bd0f07d8d26.tar.gz
[PATCH] usbcore: small changes to HCD glue layer
This patch (as549) introduces two small changes in the HCD glue layer. The first simply removes a redundant test. The second allows root-hub polling to continue for a single iteration after a host controller dies; this is needed for the patch that follows. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/core/hcd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 12ecdb03ee5..1017a97a418 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1606,7 +1606,7 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd, struct pt_regs * r)
return IRQ_NONE;
hcd->saw_irq = 1;
- if (hcd->state != start && hcd->state == HC_STATE_HALT)
+ if (hcd->state == HC_STATE_HALT)
usb_hc_died (hcd);
return IRQ_HANDLED;
}
@@ -1630,7 +1630,6 @@ void usb_hc_died (struct usb_hcd *hcd)
spin_lock_irqsave (&hcd_root_hub_lock, flags);
if (hcd->rh_registered) {
hcd->poll_rh = 0;
- del_timer(&hcd->rh_timer);
/* make khubd clean up old urbs and devices */
usb_set_device_state (hcd->self.root_hub,