]> err.no Git - linux-2.6/commitdiff
[PATCH] v4l: 788: log message
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 9 Nov 2005 05:37:34 +0000 (21:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:18 +0000 (07:56 -0800)
- 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>
drivers/media/video/msp3400.c

index 117d124657d03fe1ea393741aac1a101d370484b..5573f68ce4579bd59ff96c9ef49be9c2b50094fa 100644 (file)
@@ -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;
        }