UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] cobalt: accept unchanged timings when vb2_is_busy() 

When vb2_is_busy() it should still be possible to call S_DV_TIMINGS
provided the new timings are the same as the current timings.

For input 1 (test generator) the size is always 1080p, so just return
that.

Fixes a v4l2-compliance issue.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-07-17 08:29:40 -03:00 committed by Mauro Carvalho Chehab
parent c99235fa3e
commit 810c168c23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/pci/cobalt/cobalt-v4l2.c
View File

@ -28,6 +28,7 @@
#include <media/v4l2-ctrls.h>
#include <media/v4l2-event.h>
#include <media/v4l2-dv-timings.h>
#include <media/adv7604.h>
#include <media/adv7842.h>
@ -641,13 +642,17 @@ static int cobalt_s_dv_timings(struct file *file, void *priv_fh,
struct cobalt_stream *s = video_drvdata(file);
int err;
if (vb2_is_busy(&s->q))
return -EBUSY;
if (s->input == 1) {
*timings = cea1080p60;
return 0;
}
if (v4l2_match_dv_timings(timings, &s->timings, 0))
return 0;
if (vb2_is_busy(&s->q))
return -EBUSY;
err = v4l2_subdev_call(s->sd,
video, s_dv_timings, timings);
if (!err) {