From d8abda05c85600fd803e316a0f6afba55d09c774 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Wed, 16 Dec 2009 19:43:59 +0100
Subject: [PATCH] --- yaml --- r: 185251 b: refs/heads/master c:
 319c3ea451e19f72b578661e26fb33739af5ae1c h: refs/heads/master i:   185249:
 476e59e4e1890ddc1745d12d4cc9660ddf6d3add   185247:
 04dee41ffb8ef639f366aca8e40c3176ac4239ac v: v3

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

diff --git a/[refs] b/[refs]
index ba505ba2d192..7801785e0c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97d35f95552c9a0ee4777a7f04431a9fd1260478
+refs/heads/master: 319c3ea451e19f72b578661e26fb33739af5ae1c
diff --git a/trunk/drivers/usb/host/xhci-hcd.c b/trunk/drivers/usb/host/xhci-hcd.c
index c8573f874ec4..4cb69e0af834 100644
--- a/trunk/drivers/usb/host/xhci-hcd.c
+++ b/trunk/drivers/usb/host/xhci-hcd.c
@@ -1007,7 +1007,7 @@ int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
 	 * for usb_set_interface() and usb_set_configuration() claim).
 	 */
 	if (xhci_endpoint_init(xhci, xhci->devs[udev->slot_id],
-				udev, ep, GFP_KERNEL) < 0) {
+				udev, ep, GFP_NOIO) < 0) {
 		dev_dbg(&udev->dev, "%s - could not initialize ep %#x\n",
 				__func__, ep->desc.bEndpointAddress);
 		return -ENOMEM;