---

yaml --- r: 250205 b: refs/heads/master c: a1b4c86 h: refs/heads/master i: 250203: d4e8443 v: v3
git-mirror · May 20, 2011 · eaf6e03 · eaf6e03
1 parent 754512c
commit eaf6e03
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: 574312d8ceb689af5000fa78d40f7ee38e1ea895
+refs/heads/master: a1b4c86b2bad37963e675737ec850c851e785d6b
diff --git 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 {