aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2005-11-09 00:37:34 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:18 -0500
commit78f82405ace9415e72a87b16c195675f053381f1 (patch)
treeae75e1752423a59436dbdef62fb37ca5227bdcfd
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>
-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 117d124657d0..5573f68ce457 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)
1788 dprintk("msp34xx: AUDC_SET_RADIO\n"); 1788 dprintk("msp34xx: AUDC_SET_RADIO\n");
1789 msp->norm = VIDEO_MODE_RADIO; 1789 msp->norm = VIDEO_MODE_RADIO;
1790 dprintk("msp34xx: switching to radio mode\n"); 1790 dprintk("msp34xx: switching to radio mode\n");
1791 if (IS_MSP34XX_G(msp)) {
1792 msp34xxg_reset(client);
1793 break;
1794 }
1791 msp->watch_stereo = 0; 1795 msp->watch_stereo = 0;
1792 switch (msp->opmode) { 1796 switch (msp->opmode) {
1793 case OPMODE_MANUAL: 1797 case OPMODE_MANUAL:
@@ -1902,6 +1906,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
1902 1906
1903 dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm); 1907 dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
1904 msp->norm = vc->norm; 1908 msp->norm = vc->norm;
1909 if (IS_MSP34XX_G(msp)) {
1910 msp34xxg_reset(client);
1911 break;
1912 }
1905 msp_wake_thread(client); 1913 msp_wake_thread(client);
1906 break; 1914 break;
1907 } 1915 }
@@ -1911,6 +1919,10 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
1911 { 1919 {
1912 /* new channel -- kick audio carrier scan */ 1920 /* new channel -- kick audio carrier scan */
1913 dprintk("msp34xx: VIDIOCSFREQ\n"); 1921 dprintk("msp34xx: VIDIOCSFREQ\n");
1922 if (IS_MSP34XX_G(msp)) {
1923 msp34xxg_reset(client);
1924 break;
1925 }
1914 msp_wake_thread(client); 1926 msp_wake_thread(client);
1915 break; 1927 break;
1916 } 1928 }