aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx88/cx88-i2c.c')
-rw-r--r--drivers/media/video/cx88/cx88-i2c.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 937497c8624..566b26af523 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -109,20 +109,20 @@ static int attach_inform(struct i2c_client *client)
109 109
110 if (core->board.radio_type != UNSET) { 110 if (core->board.radio_type != UNSET) {
111 if ((core->board.radio_addr==ADDR_UNSET)||(core->board.radio_addr==client->addr)) { 111 if ((core->board.radio_addr==ADDR_UNSET)||(core->board.radio_addr==client->addr)) {
112 tun_setup.mode_mask = T_RADIO; 112 tun_setup.mode_mask = T_RADIO;
113 tun_setup.type = core->board.radio_type; 113 tun_setup.type = core->board.radio_type;
114 tun_setup.addr = core->board.radio_addr; 114 tun_setup.addr = core->board.radio_addr;
115 115 tun_setup.tuner_callback = cx88_tuner_callback;
116 client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); 116 client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
117 } 117 }
118 } 118 }
119 if (core->board.tuner_type != UNSET) { 119 if (core->board.tuner_type != UNSET) {
120 if ((core->board.tuner_addr==ADDR_UNSET)||(core->board.tuner_addr==client->addr)) { 120 if ((core->board.tuner_addr==ADDR_UNSET)||(core->board.tuner_addr==client->addr)) {
121 121
122 tun_setup.mode_mask = T_ANALOG_TV; 122 tun_setup.mode_mask = T_ANALOG_TV;
123 tun_setup.type = core->board.tuner_type; 123 tun_setup.type = core->board.tuner_type;
124 tun_setup.addr = core->board.tuner_addr; 124 tun_setup.addr = core->board.tuner_addr;
125 125 tun_setup.tuner_callback = cx88_tuner_callback;
126 client->driver->command (client,TUNER_SET_TYPE_ADDR, &tun_setup); 126 client->driver->command (client,TUNER_SET_TYPE_ADDR, &tun_setup);
127 } 127 }
128 } 128 }
@@ -182,6 +182,7 @@ static char *i2c_devs[128] = {
182 [ 0xa0 >> 1 ] = "eeprom", 182 [ 0xa0 >> 1 ] = "eeprom",
183 [ 0xc0 >> 1 ] = "tuner (analog)", 183 [ 0xc0 >> 1 ] = "tuner (analog)",
184 [ 0xc2 >> 1 ] = "tuner (analog/dvb)", 184 [ 0xc2 >> 1 ] = "tuner (analog/dvb)",
185 [ 0xc8 >> 1 ] = "xc5000",
185}; 186};
186 187
187static void do_i2c_scan(char *name, struct i2c_client *c) 188static void do_i2c_scan(char *name, struct i2c_client *c)