aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/uhci-hcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/uhci-hcd.c')
-rw-r--r--drivers/usb/host/uhci-hcd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 025b969f95e8..7b48567622ef 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -497,9 +497,9 @@ static int uhci_start(struct usb_hcd *hcd)
497 hcd->uses_new_polling = 1; 497 hcd->uses_new_polling = 1;
498 498
499 spin_lock_init(&uhci->lock); 499 spin_lock_init(&uhci->lock);
500 500 setup_timer(&uhci->fsbr_timer, uhci_fsbr_timeout,
501 (unsigned long) uhci);
501 INIT_LIST_HEAD(&uhci->idle_qh_list); 502 INIT_LIST_HEAD(&uhci->idle_qh_list);
502
503 init_waitqueue_head(&uhci->waitqh); 503 init_waitqueue_head(&uhci->waitqh);
504 504
505 if (DEBUG_CONFIGURED) { 505 if (DEBUG_CONFIGURED) {
@@ -675,6 +675,7 @@ static void uhci_stop(struct usb_hcd *hcd)
675 uhci_scan_schedule(uhci, NULL); 675 uhci_scan_schedule(uhci, NULL);
676 spin_unlock_irq(&uhci->lock); 676 spin_unlock_irq(&uhci->lock);
677 677
678 del_timer_sync(&uhci->fsbr_timer);
678 release_uhci(uhci); 679 release_uhci(uhci);
679} 680}
680 681