From cea93486f2acdee34ab60b6c2b2416378d7b67f5 Mon Sep 17 00:00:00 2001
From: Andiry Xu <andiry.xu@amd.com>
Date: Wed, 18 Jan 2012 17:47:12 +0800
Subject: [PATCH] --- yaml --- r: 287043 b: refs/heads/master c:
 cf840551a884360841bd3d3ce1ad0868ff0b759a h: refs/heads/master i:   287041:
 f3e93c144365adf2568a366dc187a8d77eddd67d   287039:
 67f8adc4f25beb7e9e5a45969042335c6832b09f v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/host/xhci-ring.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d9b7f48c4eb6..82f14bcb1fbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c24814f7eb9a194b11507b43ca0b947415754c2
+refs/heads/master: cf840551a884360841bd3d3ce1ad0868ff0b759a
diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c
index 5a818cbbab44..b62037bff688 100644
--- a/trunk/drivers/usb/host/xhci-ring.c
+++ b/trunk/drivers/usb/host/xhci-ring.c
@@ -3324,7 +3324,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;
 		}
 	}