aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2005-11-08 21:37:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:18 -0800
commit78f82405ace9415e72a87b16c195675f053381f1 (patch)
treeae75e1752423a59436dbdef62fb37ca5227bdcfd /drivers/media/video
parent74458e6c1aea9e422e46030e7bc61e9b0984be5b (diff)
[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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/msp3400.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 117d124657d..5573f68ce45 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;
}