From 1235bab78fd18f97dbaa43b22b74227c4c9d56b0 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 9 Jan 2010 00:13:36 -0800
Subject: [PATCH] --- yaml --- r: 179305 b: refs/heads/master c:
 dd38d6889dc5dae2014d9eac72fae32f477f294e h: refs/heads/master i:   179303:
 c489d162da132abcb91228ac68fbbc4f9b393b6e 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 4878dcf11b72..8c75324b864b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4e6efd2df4b5754bd519b516207eb723d1f17df
+refs/heads/master: dd38d6889dc5dae2014d9eac72fae32f477f294e
diff --git a/trunk/drivers/input/joystick/xpad.c b/trunk/drivers/input/joystick/xpad.c
index 482cb1204e43..8a28fb7846dc 100644
--- a/trunk/drivers/input/joystick/xpad.c
+++ b/trunk/drivers/input/joystick/xpad.c
@@ -446,7 +446,7 @@ static void xpad_irq_in(struct urb *urb)
 	}
 
 exit:
-	retval = usb_submit_urb (urb, GFP_ATOMIC);
+	retval = usb_submit_urb(urb, GFP_ATOMIC);
 	if (retval)
 		err ("%s - usb_submit_urb failed with result %d",
 		     __func__, retval);
@@ -571,7 +571,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data,
 		xpad->odata[6] = 0x00;
 		xpad->odata[7] = 0x00;
 		xpad->irq_out->transfer_buffer_length = 8;
-		usb_submit_urb(xpad->irq_out, GFP_KERNEL);
+		usb_submit_urb(xpad->irq_out, GFP_ATOMIC);
 	}
 
 	return 0;