aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/sl811-hcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/sl811-hcd.c')
-rw-r--r--drivers/usb/host/sl811-hcd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index e90953a9c9fb..f0fa94148d9d 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -436,8 +436,7 @@ static void finish_request(
436 ep->nextpid = USB_PID_SETUP; 436 ep->nextpid = USB_PID_SETUP;
437 437
438 spin_lock(&urb->lock); 438 spin_lock(&urb->lock);
439 if (urb->status == -EINPROGRESS) 439 urb->status = status;
440 urb->status = status;
441 spin_unlock(&urb->lock); 440 spin_unlock(&urb->lock);
442 441
443 usb_hcd_unlink_urb_from_ep(sl811_to_hcd(sl811), urb); 442 usb_hcd_unlink_urb_from_ep(sl811_to_hcd(sl811), urb);
@@ -598,7 +597,7 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank)
598 bank, status, ep, urbstat); 597 bank, status, ep, urbstat);
599 } 598 }
600 599
601 if (urb && (urbstat != -EINPROGRESS || urb->status != -EINPROGRESS)) 600 if (urb && (urbstat != -EINPROGRESS || urb->unlinked))
602 finish_request(sl811, ep, urb, urbstat); 601 finish_request(sl811, ep, urb, urbstat);
603} 602}
604 603