diff options
Diffstat (limited to 'drivers/media/video/msp3400-kthreads.c')
-rw-r--r-- | drivers/media/video/msp3400-kthreads.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c index a655e9c30146..168bca703614 100644 --- a/drivers/media/video/msp3400-kthreads.c +++ b/drivers/media/video/msp3400-kthreads.c | |||
@@ -188,7 +188,7 @@ void msp3400c_set_mode(struct i2c_client *client, int mode) | |||
188 | { | 188 | { |
189 | struct msp_state *state = to_state(i2c_get_clientdata(client)); | 189 | struct msp_state *state = to_state(i2c_get_clientdata(client)); |
190 | struct msp3400c_init_data_dem *data = &msp3400c_init_data[mode]; | 190 | struct msp3400c_init_data_dem *data = &msp3400c_init_data[mode]; |
191 | int tuner = (state->routing.input >> 3) & 1; | 191 | int tuner = (state->route_in >> 3) & 1; |
192 | int i; | 192 | int i; |
193 | 193 | ||
194 | v4l_dbg(1, msp_debug, client, "set_mode: %d\n", mode); | 194 | v4l_dbg(1, msp_debug, client, "set_mode: %d\n", mode); |
@@ -896,7 +896,7 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in) | |||
896 | static void msp34xxg_set_sources(struct i2c_client *client) | 896 | static void msp34xxg_set_sources(struct i2c_client *client) |
897 | { | 897 | { |
898 | struct msp_state *state = to_state(i2c_get_clientdata(client)); | 898 | struct msp_state *state = to_state(i2c_get_clientdata(client)); |
899 | u32 in = state->routing.input; | 899 | u32 in = state->route_in; |
900 | 900 | ||
901 | msp34xxg_set_source(client, 0x0008, (in >> 4) & 0xf); | 901 | msp34xxg_set_source(client, 0x0008, (in >> 4) & 0xf); |
902 | /* quasi-peak detector is set to same input as the loudspeaker (MAIN) */ | 902 | /* quasi-peak detector is set to same input as the loudspeaker (MAIN) */ |
@@ -912,7 +912,7 @@ static void msp34xxg_set_sources(struct i2c_client *client) | |||
912 | static void msp34xxg_reset(struct i2c_client *client) | 912 | static void msp34xxg_reset(struct i2c_client *client) |
913 | { | 913 | { |
914 | struct msp_state *state = to_state(i2c_get_clientdata(client)); | 914 | struct msp_state *state = to_state(i2c_get_clientdata(client)); |
915 | int tuner = (state->routing.input >> 3) & 1; | 915 | int tuner = (state->route_in >> 3) & 1; |
916 | int modus; | 916 | int modus; |
917 | 917 | ||
918 | /* initialize std to 1 (autodetect) to signal that no standard is | 918 | /* initialize std to 1 (autodetect) to signal that no standard is |