diff options
| author | Andiry Xu <andiry.xu@amd.com> | 2012-01-18 17:47:12 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 09:19:01 -0800 |
| commit | dd5a1b14d8c2f6ca3692aa4d829aa4afb1319f0e (patch) | |
| tree | b5d4f95cdbcddb3c48d4840b7d2509ce3215e0a6 | |
| parent | a5c55d20f4251bcc22ce82ff82add9839027e818 (diff) | |
| download | lwn-dd5a1b14d8c2f6ca3692aa4d829aa4afb1319f0e.tar.gz lwn-dd5a1b14d8c2f6ca3692aa4d829aa4afb1319f0e.zip | |
xHCI: Cleanup isoc transfer ring when TD length mismatch found
commit cf840551a884360841bd3d3ce1ad0868ff0b759a upstream.
When a TD length mismatch is found during isoc TRB enqueue, it directly
returns -EINVAL. However, isoc transfer is partially enqueued at this time,
and the ring should be cleared.
This should be backported to kernels as old as 2.6.36, which contain the
commit 522989a27c7badb608155b1f1dea3487ed431f74 "xhci: Fix failed
enqueue in the middle of isoch TD."
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 8784ab010419..edcedc4e9785 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -3382,7 +3382,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, /* Check TD length */ if (running_total != td_len) { xhci_err(xhci, "ISOC TD length unmatch\n"); - return -EINVAL; + ret = -EINVAL; + goto cleanup; } } |