From edae5021c5217cf7f49408595ea7f1620e4f8b66 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Thu, 3 Apr 2008 16:19:33 -0400
Subject: [PATCH] --- yaml --- r: 93235 b: refs/heads/master c:
 6eae9b0acdb6f03ed87ef882760e0ef8f440dc1a h: refs/heads/master i:   93233:
 a6aaabf09d0d361aabead427f8c412e99c9816a1   93231:
 5d20d679460afb11cddfc5499d95b6b6dc2ca69f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/input/joystick/xpad.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a10251fe05b2..045668e5c3f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99de0912be6f384fc31c8e8e7ba0850d0d670385
+refs/heads/master: 6eae9b0acdb6f03ed87ef882760e0ef8f440dc1a
diff --git a/trunk/drivers/input/joystick/xpad.c b/trunk/drivers/input/joystick/xpad.c
index ebf8303d6f56..d4d289e75dc2 100644
--- a/trunk/drivers/input/joystick/xpad.c
+++ b/trunk/drivers/input/joystick/xpad.c
@@ -497,7 +497,7 @@ static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
 		return 0;
 
 	xpad->odata = usb_buffer_alloc(xpad->udev, XPAD_PKT_LEN,
-				       GFP_ATOMIC, &xpad->odata_dma );
+				       GFP_KERNEL, &xpad->odata_dma);
 	if (!xpad->odata)
 		goto fail1;
 
@@ -729,7 +729,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id
 		goto fail1;
 
 	xpad->idata = usb_buffer_alloc(udev, XPAD_PKT_LEN,
-				       GFP_ATOMIC, &xpad->idata_dma);
+				       GFP_KERNEL, &xpad->idata_dma);
 	if (!xpad->idata)
 		goto fail1;