diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/core/hcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 12ecdb03ee5f..1017a97a418b 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) | |||
1606 | return IRQ_NONE; | 1606 | return IRQ_NONE; |
1607 | 1607 | ||
1608 | hcd->saw_irq = 1; | 1608 | hcd->saw_irq = 1; |
1609 | if (hcd->state != start && hcd->state == HC_STATE_HALT) | 1609 | if (hcd->state == HC_STATE_HALT) |
1610 | usb_hc_died (hcd); | 1610 | usb_hc_died (hcd); |
1611 | return IRQ_HANDLED; | 1611 | return IRQ_HANDLED; |
1612 | } | 1612 | } |
@@ -1630,7 +1630,6 @@ void usb_hc_died (struct usb_hcd *hcd) | |||
1630 | spin_lock_irqsave (&hcd_root_hub_lock, flags); | 1630 | spin_lock_irqsave (&hcd_root_hub_lock, flags); |
1631 | if (hcd->rh_registered) { | 1631 | if (hcd->rh_registered) { |
1632 | hcd->poll_rh = 0; | 1632 | hcd->poll_rh = 0; |
1633 | del_timer(&hcd->rh_timer); | ||
1634 | 1633 | ||
1635 | /* make khubd clean up old urbs and devices */ | 1634 | /* make khubd clean up old urbs and devices */ |
1636 | usb_set_device_state (hcd->self.root_hub, | 1635 | usb_set_device_state (hcd->self.root_hub, |