[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:
parent
699cc1962c
commit
ab0ab19032
|
@ -687,6 +687,9 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
|
||||||
u8 cpl_msb;
|
u8 cpl_msb;
|
||||||
int index;
|
int index;
|
||||||
|
|
||||||
|
/* Return invalid preset if no active input is detected */
|
||||||
|
qpreset->preset = V4L2_DV_INVALID;
|
||||||
|
|
||||||
device = to_tvp7002(sd);
|
device = to_tvp7002(sd);
|
||||||
|
|
||||||
/* Read standards from device registers */
|
/* Read standards from device registers */
|
||||||
|
@ -720,8 +723,6 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
|
||||||
if (index == NUM_PRESETS) {
|
if (index == NUM_PRESETS) {
|
||||||
v4l2_dbg(1, debug, sd, "detection failed: lpf = %x, cpl = %x\n",
|
v4l2_dbg(1, debug, sd, "detection failed: lpf = %x, cpl = %x\n",
|
||||||
lpfr, cpln);
|
lpfr, cpln);
|
||||||
/* Could not detect a signal, so return the 'invalid' preset */
|
|
||||||
qpreset->preset = V4L2_DV_INVALID;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue