diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2007-08-21 15:40:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 17:55:19 -0400 |
commit | eb23105462304fd35571fd0cab1de7aec79a9ec5 (patch) | |
tree | 3579e74b3f1a6e68d42de01c122d206447454d4b /drivers/usb/host/isp116x-hcd.c | |
parent | b0d9efba3ec53468984aecef8eeaf079089f2e5a (diff) |
USB: add urb->unlinked field
This patch (as970) adds a new urb->unlinked field, which is used to
store the status of unlinked URBs since we can't use urb->status for
that purpose any more. To help simplify the HCDs, usbcore will check
urb->unlinked before calling the completion handler; if the value is
set it will automatically override the status reported by the HCD.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
CC: Olav Kongas <ok@artecdesign.ee>
CC: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
CC: Tony Olech <tony.olech@elandigitalsystems.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index c2919dbc3f54..35b3507ff401 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -455,11 +455,10 @@ static void postproc_atl_queue(struct isp116x *isp116x) | |||
455 | done: | 455 | done: |
456 | if (status != -EINPROGRESS) { | 456 | if (status != -EINPROGRESS) { |
457 | spin_lock(&urb->lock); | 457 | spin_lock(&urb->lock); |
458 | if (urb->status == -EINPROGRESS) | 458 | urb->status = status; |
459 | urb->status = status; | ||
460 | spin_unlock(&urb->lock); | 459 | spin_unlock(&urb->lock); |
461 | } | 460 | } |
462 | if (urb->status != -EINPROGRESS) | 461 | if (urb->status != -EINPROGRESS || urb->unlinked) |
463 | finish_request(isp116x, ep, urb); | 462 | finish_request(isp116x, ep, urb); |
464 | } | 463 | } |
465 | } | 464 | } |