diff --git a/[refs] b/[refs]
index 6efd0835f1c8..95cbc6b02a36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86cc558ea52b123d7657e609557d60dc121eedd6
+refs/heads/master: fd984d242afbe13bd94c60b6754feda93be69bd7
diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c
index 58a6e26648ea..d14f3fbe5762 100644
--- a/trunk/drivers/usb/host/xhci-ring.c
+++ b/trunk/drivers/usb/host/xhci-ring.c
@@ -2173,7 +2173,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
 			if ((urb->actual_length != urb->transfer_buffer_length &&
 						(urb->transfer_flags &
 						 URB_SHORT_NOT_OK)) ||
-					status != 0)
+					(status != 0 &&
+					 !usb_endpoint_xfer_isoc(&urb->ep->desc)))
 				xhci_dbg(xhci, "Giveback URB %p, len = %d, "
 						"expected = %x, status = %d\n",
 						urb, urb->actual_length,