aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndiry Xu <andiry.xu@amd.com>2012-01-18 17:47:12 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-03 09:22:14 -0800
commit2089fa6dd5ce37586408a28e5a4f446c62984f76 (patch)
tree40b9e283a47b0bf60498e798e1b9a0bf3542c7a8
parent28d9b0f6c99f38e77087c69171fd8fd31201414b (diff)
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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index ee0b4d771a5..ae92dc44350 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3373,7 +3373,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;
}
}