diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2009-08-28 14:28:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 09:32:52 -0700 |
| commit | ff17e475b70b0168aa89e8726679bfedd044b998 (patch) | |
| tree | 4ff0e0e26a0f83df31306c75110e8fd620698423 | |
| parent | 1eb1b69f40b9ee5f5645109f380be78daf8e9ddd (diff) | |
| download | linux-stable-ff17e475b70b0168aa89e8726679bfedd044b998.tar.gz linux-stable-ff17e475b70b0168aa89e8726679bfedd044b998.tar.bz2 linux-stable-ff17e475b70b0168aa89e8726679bfedd044b998.zip | |
USB: xhci: Check URB_SHORT_NOT_OK before setting short packet status.
commit 204970a4bb2f584afc430ae330cd44aee329cea4 upstream.
Make sure that the driver that submitted the URB considers a short packet
an error before setting -EREMOTEIO during a short control transfer.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index b4fab00105d4..d264f9a6c559 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -991,7 +991,10 @@ static int handle_tx_event(struct xhci_hcd *xhci, break; case COMP_SHORT_TX: xhci_warn(xhci, "WARN: short transfer on control ep\n"); - status = -EREMOTEIO; + if (td->urb->transfer_flags & URB_SHORT_NOT_OK) + status = -EREMOTEIO; + else + status = 0; break; case COMP_BABBLE: /* The 0.96 spec says a babbling control endpoint @@ -1034,7 +1037,10 @@ static int handle_tx_event(struct xhci_hcd *xhci, if (event_trb == td->last_trb) { if (td->urb->actual_length != 0) { /* Don't overwrite a previously set error code */ - if (status == -EINPROGRESS || status == 0) + if ((status == -EINPROGRESS || + status == 0) && + (td->urb->transfer_flags + & URB_SHORT_NOT_OK)) /* Did we already see a short data stage? */ status = -EREMOTEIO; } else { |