aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/msp3400-kthreads.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-04-01 16:03:23 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-02 03:56:11 -0400
commit07151724a35e8e70f1aa64ce30a5a3f5c1ad49a3 (patch)
tree49ad31b5f559bd43d05fc7d9ceff6135bdce8d98 /drivers/media/video/msp3400-kthreads.c
parentab4cecf9c4e4a69cf2161f8a2424be14984430f8 (diff)
V4L/DVB (3702): Make msp3400 routing defines more consistent
Renamed various msp3400 routing defines to be more consistent and less confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really a DSP input. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/msp3400-kthreads.c')
-rw-r--r--drivers/media/video/msp3400-kthreads.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index b41ee9afbd96..633a10213789 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -856,11 +856,11 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
856 break; 856 break;
857 } 857 }
858 858
859 if (in == MSP_DSP_OUT_TUNER) 859 if (in == MSP_DSP_IN_TUNER)
860 source = (source << 8) | 0x20; 860 source = (source << 8) | 0x20;
861 /* the msp34x2g puts the MAIN_AVC, MAIN and AUX sources in 12, 13, 14 861 /* the msp34x2g puts the MAIN_AVC, MAIN and AUX sources in 12, 13, 14
862 instead of 11, 12, 13. So we add one for that msp version. */ 862 instead of 11, 12, 13. So we add one for that msp version. */
863 else if (in >= MSP_DSP_OUT_MAIN_AVC && state->has_dolby_pro_logic) 863 else if (in >= MSP_DSP_IN_MAIN_AVC && state->has_dolby_pro_logic)
864 source = ((in + 1) << 8) | matrix; 864 source = ((in + 1) << 8) | matrix;
865 else 865 else
866 source = (in << 8) | matrix; 866 source = (in << 8) | matrix;