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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b0d9efba3e
commit
eb23105462
@ -1557,15 +1557,12 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
||||
break;
|
||||
|
||||
spin_lock(&urb->lock);
|
||||
if (urb->status == -EINPROGRESS) /* Not dequeued */
|
||||
urb->status = status;
|
||||
else
|
||||
status = ECONNRESET; /* Not -ECONNRESET */
|
||||
urb->status = status;
|
||||
spin_unlock(&urb->lock);
|
||||
|
||||
/* Dequeued but completed URBs can't be given back unless
|
||||
* the QH is stopped or has finished unlinking. */
|
||||
if (status == ECONNRESET) {
|
||||
if (urb->unlinked) {
|
||||
if (QH_FINISHED_UNLINKING(qh))
|
||||
qh->is_stopped = 1;
|
||||
else if (!qh->is_stopped)
|
||||
@ -1588,7 +1585,7 @@ static void uhci_scan_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
|
||||
restart:
|
||||
list_for_each_entry(urbp, &qh->queue, node) {
|
||||
urb = urbp->urb;
|
||||
if (urb->status != -EINPROGRESS) {
|
||||
if (urb->unlinked) {
|
||||
|
||||
/* Fix up the TD links and save the toggles for
|
||||
* non-Isochronous queues. For Isochronous queues,
|
||||
|
Reference in New Issue
Block a user