diff options
Diffstat (limited to 'drivers/usb/host/ohci-q.c')
-rw-r--r-- | drivers/usb/host/ohci-q.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index 8aad6199cdcc..3c793fad178d 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
@@ -758,8 +758,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td) | |||
758 | cc = TD_CC_NOERROR; | 758 | cc = TD_CC_NOERROR; |
759 | if (cc != TD_CC_NOERROR && cc < 0x0E) { | 759 | if (cc != TD_CC_NOERROR && cc < 0x0E) { |
760 | spin_lock (&urb->lock); | 760 | spin_lock (&urb->lock); |
761 | if (urb->status == -EINPROGRESS) | 761 | urb->status = cc_to_error[cc]; |
762 | urb->status = cc_to_error [cc]; | ||
763 | spin_unlock (&urb->lock); | 762 | spin_unlock (&urb->lock); |
764 | } | 763 | } |
765 | 764 | ||
@@ -972,7 +971,7 @@ rescan_this: | |||
972 | urb = td->urb; | 971 | urb = td->urb; |
973 | urb_priv = td->urb->hcpriv; | 972 | urb_priv = td->urb->hcpriv; |
974 | 973 | ||
975 | if (urb->status == -EINPROGRESS) { | 974 | if (!urb->unlinked) { |
976 | prev = &td->hwNextTD; | 975 | prev = &td->hwNextTD; |
977 | continue; | 976 | continue; |
978 | } | 977 | } |