aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPete Eberlein <pete@sensoray.com>2011-04-01 20:21:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 08:28:31 -0400
commita1b4c86b2bad37963e675737ec850c851e785d6b (patch)
tree062d7441611c82640895a8e3f981f5dfbd12a8ce /drivers/media
parent574312d8ceb689af5000fa78d40f7ee38e1ea895 (diff)
[media] s2255drv: atomic submit urb in completion handler
An usb_submit_urb should be atomic in a completion handler. This fixes "BUG: scheduling while atomic" messages. Signed-off-by: Pete Eberlein <pete@sensoray.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/s2255drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 561909b65ce6..01a98c0d3950 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -2382,7 +2382,7 @@ static void read_pipe_completion(struct urb *purb)
2382 read_pipe_completion, pipe_info); 2382 read_pipe_completion, pipe_info);
2383 2383
2384 if (pipe_info->state != 0) { 2384 if (pipe_info->state != 0) {
2385 if (usb_submit_urb(pipe_info->stream_urb, GFP_KERNEL)) { 2385 if (usb_submit_urb(pipe_info->stream_urb, GFP_ATOMIC)) {
2386 dev_err(&dev->udev->dev, "error submitting urb\n"); 2386 dev_err(&dev->udev->dev, "error submitting urb\n");
2387 } 2387 }
2388 } else { 2388 } else {