From eaf6e0316d812192992aeb6acb918aba255e87db Mon Sep 17 00:00:00 2001
From: Pete Eberlein <pete@sensoray.com>
Date: Fri, 1 Apr 2011 21:21:26 -0300
Subject: [PATCH] --- yaml --- r: 250205 b: refs/heads/master c:
 a1b4c86b2bad37963e675737ec850c851e785d6b h: refs/heads/master i:   250203:
 d4e8443420cf669a579802c0b12ab7f4123713e3 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/video/s2255drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5cfd1223967c..df337a720e57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 574312d8ceb689af5000fa78d40f7ee38e1ea895
+refs/heads/master: a1b4c86b2bad37963e675737ec850c851e785d6b
diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c
index 561909b65ce6..01a98c0d3950 100644
--- a/trunk/drivers/media/video/s2255drv.c
+++ b/trunk/drivers/media/video/s2255drv.c
@@ -2382,7 +2382,7 @@ static void read_pipe_completion(struct urb *purb)
 			  read_pipe_completion, pipe_info);
 
 	if (pipe_info->state != 0) {
-		if (usb_submit_urb(pipe_info->stream_urb, GFP_KERNEL)) {
+		if (usb_submit_urb(pipe_info->stream_urb, GFP_ATOMIC)) {
 			dev_err(&dev->udev->dev, "error submitting urb\n");
 		}
 	} else {