Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab0ab190 authored by Mats Randgaard's avatar Mats Randgaard Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarMats Randgaard <mats.randgaard@tandberg.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 699cc196

drivers/media/video/tvp7002.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

	}