From c6a7a652fecfd285cb9bc40e258f557124868dca Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oliver@neukum.org>
Date: Sat, 20 Feb 2010 02:03:19 +0100
Subject: [PATCH] --- yaml --- r: 185420 b: refs/heads/master c:
 3756c7c091f4ca8bcaf89ee3855a326d69209716 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c5853edaa2da..c4a1b904ca32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b72d78cb022714c89a9ebc00b9581b550cfca7
+refs/heads/master: 3756c7c091f4ca8bcaf89ee3855a326d69209716
diff --git a/trunk/drivers/usb/storage/onetouch.c b/trunk/drivers/usb/storage/onetouch.c
index 80e65f29921c..198bb3ed95b2 100644
--- a/trunk/drivers/usb/storage/onetouch.c
+++ b/trunk/drivers/usb/storage/onetouch.c
@@ -202,7 +202,7 @@ static int onetouch_connect_input(struct us_data *ss)
 		goto fail1;
 
 	onetouch->data = usb_buffer_alloc(udev, ONETOUCH_PKT_LEN,
-					  GFP_ATOMIC, &onetouch->data_dma);
+					  GFP_KERNEL, &onetouch->data_dma);
 	if (!onetouch->data)
 		goto fail1;