---

yaml
---
r: 254847
b: refs/heads/master
c: ddc6ff3
h: refs/heads/master
i:
  254845: eac3ebc
  254843: 5e72e50
  254839: 94b8504
  254831: e00e4b0
  254815: efd9f4c
  254783: 6a7a47a
  254719: 48ecc37
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad339a29858db6544052f98973d235129f9f49c
+refs/heads/master: ddc6ff31cc22720c46c1547a5310ea260a968ae9

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;