diff options
Diffstat (limited to 'drivers/media/video/msp3400-kthreads.c')
-rw-r--r-- | drivers/media/video/msp3400-kthreads.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c index 61ec794a737e..7f5568592793 100644 --- a/drivers/media/video/msp3400-kthreads.c +++ b/drivers/media/video/msp3400-kthreads.c | |||
@@ -833,11 +833,6 @@ static int msp34xxg_modus(struct i2c_client *client) | |||
833 | v4l_dbg(1, msp_debug, client, "selected radio modus\n"); | 833 | v4l_dbg(1, msp_debug, client, "selected radio modus\n"); |
834 | return 0x0001; | 834 | return 0x0001; |
835 | } | 835 | } |
836 | |||
837 | if (state->v4l2_std & V4L2_STD_PAL) { | ||
838 | v4l_dbg(1, msp_debug, client, "selected PAL modus\n"); | ||
839 | return 0x7001; | ||
840 | } | ||
841 | if (state->v4l2_std == V4L2_STD_NTSC_M_JP) { | 836 | if (state->v4l2_std == V4L2_STD_NTSC_M_JP) { |
842 | v4l_dbg(1, msp_debug, client, "selected M (EIA-J) modus\n"); | 837 | v4l_dbg(1, msp_debug, client, "selected M (EIA-J) modus\n"); |
843 | return 0x4001; | 838 | return 0x4001; |
@@ -846,15 +841,15 @@ static int msp34xxg_modus(struct i2c_client *client) | |||
846 | v4l_dbg(1, msp_debug, client, "selected M (A2) modus\n"); | 841 | v4l_dbg(1, msp_debug, client, "selected M (A2) modus\n"); |
847 | return 0x0001; | 842 | return 0x0001; |
848 | } | 843 | } |
844 | if (state->v4l2_std == V4L2_STD_SECAM_L) { | ||
845 | v4l_dbg(1, msp_debug, client, "selected SECAM-L modus\n"); | ||
846 | return 0x6001; | ||
847 | } | ||
849 | if (state->v4l2_std & V4L2_STD_MN) { | 848 | if (state->v4l2_std & V4L2_STD_MN) { |
850 | v4l_dbg(1, msp_debug, client, "selected M (BTSC) modus\n"); | 849 | v4l_dbg(1, msp_debug, client, "selected M (BTSC) modus\n"); |
851 | return 0x2001; | 850 | return 0x2001; |
852 | } | 851 | } |
853 | if (state->v4l2_std & V4L2_STD_SECAM) { | 852 | return 0x7001; |
854 | v4l_dbg(1, msp_debug, client, "selected SECAM modus\n"); | ||
855 | return 0x6001; | ||
856 | } | ||
857 | return 0x0001; | ||
858 | } | 853 | } |
859 | 854 | ||
860 | static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) | 855 | static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) |