From 0856e71305200aa40821ab315819971229bbdb38 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 23 Apr 2012 15:06:09 +0200
Subject: [PATCH] --- yaml --- r: 303717 b: refs/heads/master c:
 9c745995ae5c4ff787f34a359de908facc11ee00 h: refs/heads/master i:   303715:
 2cbf28be33a5cce29ea000d3d6036557279b477f v: v3

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

diff --git a/[refs] b/[refs]
index c266a8addd4c..c06bb0ce530b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f370b9968a220a3d79d870dd7dee674cc0ff3d10
+refs/heads/master: 9c745995ae5c4ff787f34a359de908facc11ee00
diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c
index cb1de111daee..d40194c8ca60 100644
--- a/trunk/drivers/usb/host/xhci-ring.c
+++ b/trunk/drivers/usb/host/xhci-ring.c
@@ -1804,6 +1804,7 @@ static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
 		break;
 	case COMP_DEV_ERR:
 	case COMP_STALL:
+	case COMP_TX_ERR:
 		frame->status = -EPROTO;
 		skip_td = true;
 		break;