---

yaml --- r: 185420 b: refs/heads/master c: 3756c7c h: refs/heads/master v: v3
git-mirror · Mar 2, 2010 · c6a7a65 · c6a7a65
1 parent 8a61d09
commit c6a7a65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;