2 files changed, 11 insertions, 28 deletions

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 89aa5cbb8b9e..d81672acdaad 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -3188,7 +3188,7 @@ void __devinit bttv_init_card1(struct bttv *btv)
 void __devinit bttv_init_card2(struct bttv *btv)
 {
         int tda9887;
-        int addr=ADDR_UNSET, radio_addr=ADDR_UNSET;
+        int addr=ADDR_UNSET;
 
         btv->tuner_type = -1;
 
@@ -3333,31 +3333,28 @@ void __devinit bttv_init_card2(struct bttv *btv)
         if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
                 addr = bttv_tvcards[btv->c.type].tuner_addr;
 
-        if (ADDR_UNSET != bttv_tvcards[btv->c.type].radio_addr)
-                radio_addr = bttv_tvcards[btv->c.type].radio_addr;
-
         if (UNSET != bttv_tvcards[btv->c.type].tuner_type)
                 if(UNSET == btv->tuner_type)
                         btv->tuner_type = bttv_tvcards[btv->c.type].tuner_type;
         if (UNSET != tuner[btv->c.nr])
                 btv->tuner_type = tuner[btv->c.nr];
         printk("bttv%d: using tuner=%d\n",btv->c.nr,btv->tuner_type);
-        if (btv->pinnacle_id != UNSET)
-                bttv_call_i2c_clients(btv, AUDC_CONFIG_PINNACLE,
-                                      &btv->pinnacle_id);
+
         if (btv->tuner_type != UNSET) {
                 struct tuner_setup tun_setup;
 
-                tun_setup.mode_mask =  T_ANALOG_TV | T_DIGITAL_TV;
+                tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
                 tun_setup.type = btv->tuner_type;
                 tun_setup.addr = addr;
 
-                if (addr == radio_addr)
-                        tun_setup.mode_mask =  T_RADIO;
-
                 bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
         }
 
+        if (btv->pinnacle_id != UNSET) {
+                bttv_call_i2c_clients(btv, AUDC_CONFIG_PINNACLE,
+                                                        &btv->pinnacle_id);
+        }
+
         btv->svhs = bttv_tvcards[btv->c.type].svhs;
         if (svhs[btv->c.nr] != UNSET)
                 btv->svhs = svhs[btv->c.nr];
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 5ad335705e1f..aaabef26105a 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -291,14 +291,11 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 static int attach_inform(struct i2c_client *client)
 {
         struct bttv *btv = i2c_get_adapdata(client->adapter);
-        int radio_addr=ADDR_UNSET, addr=ADDR_UNSET;
+        int radio_addr=ADDR_UNSET;
 
         if (ADDR_UNSET != bttv_tvcards[btv->c.type].radio_addr)
                 radio_addr = bttv_tvcards[btv->c.type].radio_addr;
 
-        if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
-                addr = bttv_tvcards[btv->c.type].tuner_addr;
-
         if (bttv_debug)
                 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
                         btv->c.nr,client->driver->name,client->addr,
@@ -310,25 +307,14 @@ static int attach_inform(struct i2c_client *client)
                 struct tuner_setup tun_setup;
                 struct tuner *t = i2c_get_clientdata(client);
 
-                if ((addr==ADDR_UNSET)||(addr==client->addr)) {
-                        tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
-                        tun_setup.type = btv->tuner_type;
-                        tun_setup.addr = ADDR_UNSET;
-
-                }
-
                 if (t->type != UNSET && t->mode_mask == T_RADIO) {
                         tun_setup.type = t->type;
                         tun_setup.mode_mask =  T_RADIO;
-                        tun_setup.addr = ADDR_UNSET;
+                        tun_setup.addr = radio_addr;
+                        client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
-
-                client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
         }
 
-        if (btv->pinnacle_id != UNSET)
-                client->driver->command(client,AUDC_CONFIG_PINNACLE,
-                                      &btv->pinnacle_id);
         return 0;
 }