openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] TVP7002: Return V4L2_DV_INVALID if any of the errors occur 

Signed-off-by: Mats Randgaard <mats.randgaard@tandberg.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mats Randgaard 2010-08-03 04:18:03 -03:00 committed by Mauro Carvalho Chehab
parent 699cc1962c
commit ab0ab19032
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/tvp7002.c
View File

@ -687,6 +687,9 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
u8 cpl_msb;
int index;
/* Return invalid preset if no active input is detected */
qpreset->preset = V4L2_DV_INVALID;
device = to_tvp7002(sd);
/* Read standards from device registers */
@ -720,8 +723,6 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
if (index == NUM_PRESETS) {
v4l2_dbg(1, debug, sd, "detection failed: lpf = %x, cpl = %x\n",
lpfr, cpln);
/* Could not detect a signal, so return the 'invalid' preset */
qpreset->preset = V4L2_DV_INVALID;
return 0;
}