diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-09 12:46:54 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-09 12:46:54 +0100 |
| commit | c1855a4044f8e28d4de4e9d942d19223ab2d5048 (patch) | |
| tree | 392075ab95c264cd664b115385613ba3d6c645af /linux | |
| parent | 3f72680cffe13ed084fab3c4cc94e40ff14ed19a (diff) | |
| download | mediapointer-dvb-s2-c1855a4044f8e28d4de4e9d942d19223ab2d5048.tar.gz mediapointer-dvb-s2-c1855a4044f8e28d4de4e9d942d19223ab2d5048.tar.bz2 | |
msp3400: fix SECAM D/K handling
From: Hans Verkuil <hverkuil@xs4all.nl>
The 6.5 MHz carrier was interpreted as SECAM-L even if SECAM-D/K was
selected.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/msp3400-kthreads.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/linux/drivers/media/video/msp3400-kthreads.c b/linux/drivers/media/video/msp3400-kthreads.c index 2fe8f8738..0280feaac 100644 --- a/linux/drivers/media/video/msp3400-kthreads.c +++ b/linux/drivers/media/video/msp3400-kthreads.c @@ -867,11 +867,6 @@ static int msp34xxg_modus(struct i2c_client *client) v4l_dbg(1, msp_debug, client, "selected radio modus\n"); return 0x0001; } - - if (state->v4l2_std & V4L2_STD_PAL) { - v4l_dbg(1, msp_debug, client, "selected PAL modus\n"); - return 0x7001; - } if (state->v4l2_std == V4L2_STD_NTSC_M_JP) { v4l_dbg(1, msp_debug, client, "selected M (EIA-J) modus\n"); return 0x4001; @@ -880,15 +875,15 @@ static int msp34xxg_modus(struct i2c_client *client) v4l_dbg(1, msp_debug, client, "selected M (A2) modus\n"); return 0x0001; } + if (state->v4l2_std == V4L2_STD_SECAM_L) { + v4l_dbg(1, msp_debug, client, "selected SECAM-L modus\n"); + return 0x6001; + } if (state->v4l2_std & V4L2_STD_MN) { v4l_dbg(1, msp_debug, client, "selected M (BTSC) modus\n"); return 0x2001; } - if (state->v4l2_std & V4L2_STD_SECAM) { - v4l_dbg(1, msp_debug, client, "selected SECAM modus\n"); - return 0x6001; - } - return 0x0001; + return 0x7001; } static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) |