1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index e509ed91a290..5ad335705e1f 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -308,21 +308,22 @@ 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 ((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;
 
-                        client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
-                if ((radio_addr==ADDR_UNSET)||(radio_addr==client->addr)) {
+
+                if (t->type != UNSET && t->mode_mask == T_RADIO) {
+                        tun_setup.type = t->type;
                         tun_setup.mode_mask =  T_RADIO;
-                        tun_setup.type = btv->tuner_type;
                         tun_setup.addr = ADDR_UNSET;
-
-                        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)