From ccf9a98a8cbbb49efdc583fbae045b244025f890 Mon Sep 17 00:00:00 2001
From: Mats Randgaard <mats.randgaard@tandberg.com>
Date: Tue, 3 Aug 2010 04:18:03 -0300
Subject: [PATCH] --- yaml --- r: 271871 b: refs/heads/master c:
 ab0ab19032d16ad63e81f2fe98ae35d76296d8d9 h: refs/heads/master i:   271869:
 9b66d5c6a6cf8117070668c0de198f04e79fec71   271867:
 6e1f7b6ba09e8dbe12ba4a4131247d0150664a22   271863:
 c512782e4aa0334f37637ae3ae0fce24f844507e   271855:
 3bb23593e9b938a79d153d093f4d18b9d334f6a9   271839:
 6b02ec3f12e1e26d7c93b389813db07bf618ee21   271807:
 90912ec7e964d99ba0fc774318e9e197ff0b28e8   271743:
 02ff0f03bc248259c692f36b3d161216da2ac604   271615:
 e36eb74819f0294a59e678c506f840b3199616c2   271359:
 475eba0b182f10222f01afb4e9d734671aca675a v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/video/tvp7002.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d6f269acde4a..055c8b0c077a 100644
--- 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
index b799851bf3d0..d78be2f710e5 100644
--- 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;
 	}