From 482ec5e5f8ca1e4faf9b44df83cf39bbc048a323 Mon Sep 17 00:00:00 2001
From: Andiry Xu <andiry.xu@amd.com>
Date: Thu, 22 Jul 2010 15:23:52 -0700
Subject: [PATCH] --- yaml --- r: 208045 b: refs/heads/master c:
 787f4e5adaabba01becd646818dbace2d7e6b386 h: refs/heads/master i:   208043:
 14ff108dd9bdb001e000ce631380b2dda4658cc8 v: v3

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

diff --git a/[refs] b/[refs]
index 654be7c44a6b..cc911ccd2349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a061a5a0b816de3b4711a2e96764bb3cd8df861e
+refs/heads/master: 787f4e5adaabba01becd646818dbace2d7e6b386
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index 295a0a2063a6..89ac48534099 100644
--- a/trunk/drivers/usb/host/xhci.c
+++ b/trunk/drivers/usb/host/xhci.c
@@ -897,7 +897,12 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
 				slot_id, ep_index);
 		spin_unlock_irqrestore(&xhci->lock, flags);
 	} else {
-		ret = -EINVAL;
+		spin_lock_irqsave(&xhci->lock, flags);
+		if (xhci->xhc_state & XHCI_STATE_DYING)
+			goto dying;
+		ret = xhci_queue_isoc_tx_prepare(xhci, GFP_ATOMIC, urb,
+				slot_id, ep_index);
+		spin_unlock_irqrestore(&xhci->lock, flags);
 	}
 exit:
 	return ret;