diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:40:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:40:00 -0300 |
| commit | 91b24eda72df7f1320bf3b064515c96039bfca0d (patch) | |
| tree | 99e8ea8f19c28758417d4c3398523595359d48c7 /linux/drivers/media/video/uvc/uvc_v4l2.c | |
| parent | 2fca1e165c0f13087c2eaed3d0e4a4c4fbb24fe5 (diff) | |
| parent | fd4694cdbe15f591792ec5166c3d9791c4b1e34f (diff) | |
| download | mediapointer-dvb-s2-91b24eda72df7f1320bf3b064515c96039bfca0d.tar.gz mediapointer-dvb-s2-91b24eda72df7f1320bf3b064515c96039bfca0d.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/video4linux
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_v4l2.c b/linux/drivers/media/video/uvc/uvc_v4l2.c index 160c01314..736d8ae23 100644 --- a/linux/drivers/media/video/uvc/uvc_v4l2.c +++ b/linux/drivers/media/video/uvc/uvc_v4l2.c @@ -251,7 +251,7 @@ static int uvc_v4l2_set_format(struct uvc_video_device *video, if (fmt->type != video->streaming->type) return -EINVAL; - if (uvc_queue_streaming(&video->queue)) + if (uvc_queue_allocated(&video->queue)) return -EBUSY; ret = uvc_v4l2_try_format(video, fmt, &probe, &format, &frame); |