diff options
Diffstat (limited to 'drivers/usb/host/uhci-hcd.c')
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index eb4eab98e8bf..45ee6920a850 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -252,7 +252,7 @@ __acquires(uhci->lock) | |||
252 | uhci->is_stopped = UHCI_IS_STOPPED; | 252 | uhci->is_stopped = UHCI_IS_STOPPED; |
253 | uhci_to_hcd(uhci)->poll_rh = !int_enable; | 253 | uhci_to_hcd(uhci)->poll_rh = !int_enable; |
254 | 254 | ||
255 | uhci_scan_schedule(uhci, NULL); | 255 | uhci_scan_schedule(uhci); |
256 | uhci_fsbr_off(uhci); | 256 | uhci_fsbr_off(uhci); |
257 | } | 257 | } |
258 | 258 | ||
@@ -309,7 +309,7 @@ __acquires(uhci->lock) | |||
309 | mod_timer(&uhci_to_hcd(uhci)->rh_timer, jiffies); | 309 | mod_timer(&uhci_to_hcd(uhci)->rh_timer, jiffies); |
310 | } | 310 | } |
311 | 311 | ||
312 | static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs) | 312 | static irqreturn_t uhci_irq(struct usb_hcd *hcd) |
313 | { | 313 | { |
314 | struct uhci_hcd *uhci = hcd_to_uhci(hcd); | 314 | struct uhci_hcd *uhci = hcd_to_uhci(hcd); |
315 | unsigned short status; | 315 | unsigned short status; |
@@ -358,7 +358,7 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs) | |||
358 | usb_hcd_poll_rh_status(hcd); | 358 | usb_hcd_poll_rh_status(hcd); |
359 | else { | 359 | else { |
360 | spin_lock_irqsave(&uhci->lock, flags); | 360 | spin_lock_irqsave(&uhci->lock, flags); |
361 | uhci_scan_schedule(uhci, regs); | 361 | uhci_scan_schedule(uhci); |
362 | spin_unlock_irqrestore(&uhci->lock, flags); | 362 | spin_unlock_irqrestore(&uhci->lock, flags); |
363 | } | 363 | } |
364 | 364 | ||
@@ -671,7 +671,7 @@ static void uhci_stop(struct usb_hcd *hcd) | |||
671 | spin_lock_irq(&uhci->lock); | 671 | spin_lock_irq(&uhci->lock); |
672 | if (test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags) && !uhci->dead) | 672 | if (test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags) && !uhci->dead) |
673 | uhci_hc_died(uhci); | 673 | uhci_hc_died(uhci); |
674 | uhci_scan_schedule(uhci, NULL); | 674 | uhci_scan_schedule(uhci); |
675 | spin_unlock_irq(&uhci->lock); | 675 | spin_unlock_irq(&uhci->lock); |
676 | 676 | ||
677 | del_timer_sync(&uhci->fsbr_timer); | 677 | del_timer_sync(&uhci->fsbr_timer); |