diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index ae5ba4ddfb40..b948ffd94f45 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1147,8 +1147,7 @@ rescan: | |||
1147 | case QH_STATE_UNLINK: /* wait for hw to finish? */ | 1147 | case QH_STATE_UNLINK: /* wait for hw to finish? */ |
1148 | idle_timeout: | 1148 | idle_timeout: |
1149 | spin_unlock_irqrestore (&ehci->lock, flags); | 1149 | spin_unlock_irqrestore (&ehci->lock, flags); |
1150 | set_current_state (TASK_UNINTERRUPTIBLE); | 1150 | schedule_timeout_uninterruptible(1); |
1151 | schedule_timeout (1); | ||
1152 | goto rescan; | 1151 | goto rescan; |
1153 | case QH_STATE_IDLE: /* fully unlinked */ | 1152 | case QH_STATE_IDLE: /* fully unlinked */ |
1154 | if (list_empty (&qh->qtd_list)) { | 1153 | if (list_empty (&qh->qtd_list)) { |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 56b43f2a0e52..ddaa9c82c58d 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -382,8 +382,7 @@ sanitize: | |||
382 | goto sanitize; | 382 | goto sanitize; |
383 | } | 383 | } |
384 | spin_unlock_irqrestore (&ohci->lock, flags); | 384 | spin_unlock_irqrestore (&ohci->lock, flags); |
385 | set_current_state (TASK_UNINTERRUPTIBLE); | 385 | schedule_timeout_uninterruptible(1); |
386 | schedule_timeout (1); | ||
387 | goto rescan; | 386 | goto rescan; |
388 | case ED_IDLE: /* fully unlinked */ | 387 | case ED_IDLE: /* fully unlinked */ |
389 | if (list_empty (&ed->td_list)) { | 388 | if (list_empty (&ed->td_list)) { |