From 60275a6f1f015146d39bf1e474403e8491743de6 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Sun, 26 Jun 2011 06:16:03 -0300
Subject: [PATCH] --- yaml --- r: 254847 b: refs/heads/master c:
 ddc6ff31cc22720c46c1547a5310ea260a968ae9 h: refs/heads/master i:   254845:
 eac3ebc9120a8f724c2b9d532e6d6d1ce76cc3c4   254843:
 5e72e504aa64b47b4847370e1a9b5ce4217683ce   254839:
 94b8504d16e949bb8870801035a69699b53c7e97   254831:
 e00e4b04ed6ad6a931cd87595c04dd8f910e83f0   254815:
 efd9f4c4abb2c9f1c08b746fe538ed73c459446d   254783:
 6a7a47a41588ab4b88c8093de55844826fd5e4a7   254719:
 48ecc375c4994583df18fed4665ca11c4ef17770 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/msp3400-driver.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index edef72f6a10f..bd2caddb39e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad339a29858db6544052f98973d235129f9f49c
+refs/heads/master: ddc6ff31cc22720c46c1547a5310ea260a968ae9
diff --git a/trunk/drivers/media/video/msp3400-driver.c b/trunk/drivers/media/video/msp3400-driver.c
index de5d481b0328..c43c81f5f978 100644
--- a/trunk/drivers/media/video/msp3400-driver.c
+++ b/trunk/drivers/media/video/msp3400-driver.c
@@ -480,12 +480,14 @@ static int msp_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
 	struct msp_state *state = to_state(sd);
 	struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-	if (state->radio)
+	if (vt->type != V4L2_TUNER_ANALOG_TV)
 		return 0;
-	if (state->opmode == OPMODE_AUTOSELECT)
-		msp_detect_stereo(client);
-	vt->audmode    = state->audmode;
-	vt->rxsubchans = state->rxsubchans;
+	if (!state->radio) {
+		if (state->opmode == OPMODE_AUTOSELECT)
+			msp_detect_stereo(client);
+		vt->rxsubchans = state->rxsubchans;
+	}
+	vt->audmode = state->audmode;
 	vt->capability |= V4L2_TUNER_CAP_STEREO |
 		V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
 	return 0;