diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 17:48:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 17:48:11 -0300 |
| commit | aaaaa6a00dd372109ceb39c63aef9088ec86e344 (patch) | |
| tree | a33ab322c266ae761fa32c397c88a761b92c3bd8 /linux/drivers/media/video/uvc/uvc_v4l2.c | |
| parent | 0e0a1701b02504470a123c46787736681b329c9e (diff) | |
| parent | 3d4939aa3fd67ca96970740ca759d960c8511437 (diff) | |
| download | mediapointer-dvb-s2-aaaaa6a00dd372109ceb39c63aef9088ec86e344.tar.gz mediapointer-dvb-s2-aaaaa6a00dd372109ceb39c63aef9088ec86e344.tar.bz2 | |
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
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); |