Fix msp343xG handling regression
PATCH 1/2 Fix msp343xG handling regression
Quoted 1 line
From
04b0693f33d4ee6a6a8eed116c6d5d1f3eb77d63Mon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Mon, 2 Oct 2006 23:03:59 -0400
Subject: [PATCH] Fix msp343xG handling regression
The msp3430G and msp3435G models cannot do Automatic Standard Detection, so these should be forced to BTSC. These chips are early production versions for the msp34xxG series and are quite rare.
Due to broken handling of the 'standard' option in 2.6.17, there is no workaround possible.
Signed-off-by Hans Verkuil <[email protected]>
Signed-off-by Michael Krufky <[email protected]>
--- drivers/media/video/msp3400-driver.c | 2 ++ drivers/media/video/msp3400-driver.h | 1 + drivers/media/video/msp3400-kthreads.c | 7 ++++--- 3 files changed, 7 insertions(+), 3 deletions(-)
drivers/media/video/msp3400-driver.c +2 -0
@@ -942,6 +942,8 @@ static int msp_attach(struct i2c_adapter state->has_virtual_dolby_surround = msp_revision =='G' && msp_prod_lo ==1 ;/* Has Virtual Dolby Surround & Dolby Pro Logic: only in msp34x2 */ state->has_dolby_pro_logic = msp_revision =='G' && msp_prod_lo ==2 ; +/* The msp343xG supports BTSC only and cannot do Automatic Standard Detection. */ + state->force_btsc = msp_family ==3 && msp_revision =='G' && msp_prod_hi ==3 ; state->opmode = opmode;if (state->opmode ==OPMODE_AUTO ) {
drivers/media/video/msp3400-driver.h +1 -0
@@ -64,6 +64,7 @@ struct msp_state {u8 has_sound_processing;u8 has_virtual_dolby_surround;u8 has_dolby_pro_logic; +u8 force_btsc;int radio;int opmode;
drivers/media/video/msp3400-kthreads.c +4 -3
@@ -949,11 +949,12 @@ int msp34xxg_thread(void *data)/* setup the chip*/ msp34xxg_reset (client); - state->std = state->radio ?0x40 : msp_standard; -if (state->std !=1 ) - goto unmute; + state->std = state->radio ?0x40 : + (state->force_btsc && msp_standard ==1 ) ?32 : msp_standard;/* start autodetect */ msp_write_dem (client,0x20 , state->std); +if (state->std !=1 ) + goto unmute;/* watch autodetect */ v4l_dbg (1 , msp_debug, client,"started autodetect, waiting for result\n" );