2 files changed, 15 insertions, 11 deletions

diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index aaabef26105a..1b3e0a769518 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -291,10 +291,12 @@ 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;
+        int addr=ADDR_UNSET;
+
+
+        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 (bttv_debug)
                 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
@@ -305,14 +307,16 @@ static int attach_inform(struct i2c_client *client)
 
         if (btv->tuner_type != UNSET) {
                 struct tuner_setup tun_setup;
-                struct tuner *t = i2c_get_clientdata(client);
 
-                if (t->type != UNSET && t->mode_mask == T_RADIO) {
-                        tun_setup.type = t->type;
-                        tun_setup.mode_mask =  T_RADIO;
-                        tun_setup.addr = radio_addr;
-                        client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
+                if ((addr==ADDR_UNSET) ||
+                                (addr==client->addr)) {
+
+                        tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
+                        tun_setup.type = btv->tuner_type;
+                        tun_setup.addr = addr;
+                        bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
+
         }
 
         return 0;
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 3fde4f90425a..73c4041c35d7 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -222,9 +222,9 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup)
 {
         struct tuner *t = i2c_get_clientdata(c);
 
-        if ((tun_setup->addr == ADDR_UNSET &&
+        if ( t->type == UNSET && ((tun_setup->addr == ADDR_UNSET &&
                 (t->mode_mask & tun_setup->mode_mask)) ||
-                tun_setup->addr == c->addr) {
+                tun_setup->addr == c->addr)) {
                         set_type(c, tun_setup->type, tun_setup->mode_mask);
         }
 }