---

yaml --- r: 271871 b: refs/heads/master c: ab0ab19 h: refs/heads/master i: 271869: 9b66d5c 271867: 6e1f7b6 271863: c512782 271855: 3bb2359 271839: 6b02ec3 271807: 90912ec 271743: 02ff0f0 271615: e36eb74 271359: 475eba0 v: v3
git-mirror · Sep 22, 2011 · ccf9a98 · ccf9a98
1 parent 61a28b3
commit ccf9a98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 699cc1962c85351689c27dd46e598e4204fdd105
+refs/heads/master: ab0ab19032d16ad63e81f2fe98ae35d76296d8d9
diff --git a/trunk/drivers/media/video/tvp7002.c b/trunk/drivers/media/video/tvp7002.c
@@ -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;
 	}