From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 9 Nov 2005 05:37:34 +0000 (-0800)
Subject: [PATCH] v4l: 788: log message
X-Git-Tag: v2.6.15-rc1~223
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78f82405ace9415e72a87b16c195675f053381f1;p=linux-2.6

[PATCH] v4l: 788: log message

- This fixes dual language detection on the msp3400.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 117d124657..5573f68ce4 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1788,6 +1788,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 		dprintk("msp34xx: AUDC_SET_RADIO\n");
 		msp->norm = VIDEO_MODE_RADIO;
 		dprintk("msp34xx: switching to radio mode\n");
+		if (IS_MSP34XX_G(msp)) {
+			msp34xxg_reset(client);
+			break;
+		}
 		msp->watch_stereo = 0;
 		switch (msp->opmode) {
 		case OPMODE_MANUAL:
@@ -1902,6 +1906,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 		dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
 		msp->norm = vc->norm;
+		if (IS_MSP34XX_G(msp)) {
+			msp34xxg_reset(client);
+			break;
+		}
 		msp_wake_thread(client);
 		break;
 	}
@@ -1911,6 +1919,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
 	{
 		/* new channel -- kick audio carrier scan */
 		dprintk("msp34xx: VIDIOCSFREQ\n");
+		if (IS_MSP34XX_G(msp)) {
+			msp34xxg_reset(client);
+			break;
+		}
 		msp_wake_thread(client);
 		break;
 	}