From 091bf940f16fef21a4168847d6aa1db62ba77c77 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Mon, 27 Jul 2009 12:04:32 -0700
Subject: [PATCH] --- yaml --- r: 155963 b: refs/heads/master c:
 4a73143ced467868e92d7914d9f8bf797640927b h: refs/heads/master i:   155961:
 57c5024856067fdd90e281e16102ef971c885fcf   155959:
 8c2511cc58e7444f5d239b1bbef38f10616c576e v: v3

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

diff --git a/[refs] b/[refs]
index 7ec97aeb4e6e..a5cac5e9c14e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47692d179f7a88794bcd302e53ca7899d7592db9
+refs/heads/master: 4a73143ced467868e92d7914d9f8bf797640927b
diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c
index 1fc0decfa0ac..0903e98989ec 100644
--- a/trunk/drivers/usb/host/xhci-ring.c
+++ b/trunk/drivers/usb/host/xhci-ring.c
@@ -876,6 +876,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,
 		xhci_warn(xhci, "WARN: transfer error on endpoint\n");
 		status = -EPROTO;
 		break;
+	case COMP_BABBLE:
+		xhci_warn(xhci, "WARN: babble error on endpoint\n");
+		status = -EOVERFLOW;
+		break;
 	case COMP_DB_ERR:
 		xhci_warn(xhci, "WARN: HC couldn't access mem fast enough\n");
 		status = -ENOSR;