diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /drivers/usb/host/imx21-hcd.c | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'drivers/usb/host/imx21-hcd.c')
| -rw-r--r-- | drivers/usb/host/imx21-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index caf116c09376..d0abb9b0e673 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
| @@ -1521,7 +1521,7 @@ static int imx21_hc_reset(struct usb_hcd *hcd) | |||
| 1521 | return -ETIMEDOUT; | 1521 | return -ETIMEDOUT; |
| 1522 | } | 1522 | } |
| 1523 | spin_unlock_irq(&imx21->lock); | 1523 | spin_unlock_irq(&imx21->lock); |
| 1524 | schedule_timeout(1); | 1524 | schedule_timeout_uninterruptible(1); |
| 1525 | spin_lock_irq(&imx21->lock); | 1525 | spin_lock_irq(&imx21->lock); |
| 1526 | } | 1526 | } |
| 1527 | spin_unlock_irqrestore(&imx21->lock, flags); | 1527 | spin_unlock_irqrestore(&imx21->lock, flags); |