aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/msp3400.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/msp3400.c')
-rw-r--r--drivers/media/video/msp3400.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 699cea2cc648..ba2c95842fba 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1788,10 +1788,9 @@ 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)) { 1791 if (IS_MSP34XX_G(msp))
1792 msp34xxg_reset(client); 1792 msp34xxg_reset(client);
1793 break; 1793
1794 }
1795 msp->watch_stereo = 0; 1794 msp->watch_stereo = 0;
1796 switch (msp->opmode) { 1795 switch (msp->opmode) {
1797 case OPMODE_MANUAL: 1796 case OPMODE_MANUAL:
@@ -1906,10 +1905,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
1906 1905
1907 dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm); 1906 dprintk("msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
1908 msp->norm = vc->norm; 1907 msp->norm = vc->norm;
1909 if (IS_MSP34XX_G(msp)) { 1908 if (IS_MSP34XX_G(msp))
1910 msp34xxg_reset(client); 1909 msp34xxg_reset(client);
1911 break; 1910
1912 }
1913 msp_wake_thread(client); 1911 msp_wake_thread(client);
1914 break; 1912 break;
1915 } 1913 }
@@ -1919,10 +1917,9 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
1919 { 1917 {
1920 /* new channel -- kick audio carrier scan */ 1918 /* new channel -- kick audio carrier scan */
1921 dprintk("msp34xx: VIDIOCSFREQ\n"); 1919 dprintk("msp34xx: VIDIOCSFREQ\n");
1922 if (IS_MSP34XX_G(msp)) { 1920 if (IS_MSP34XX_G(msp))
1923 msp34xxg_reset(client); 1921 msp34xxg_reset(client);
1924 break; 1922
1925 }
1926 msp_wake_thread(client); 1923 msp_wake_thread(client);
1927 break; 1924 break;
1928 } 1925 }