2 files changed, 7 insertions, 8 deletions

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 695a67e9edd7..89aa5cbb8b9e 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -2721,13 +2721,11 @@ struct tvcard bttv_tvcards[] = {
                 .audiomux       = { 0, 1, 2, 2, 3 },
                 .needs_tvaudio  = 0,
                 .pll            = PLL_28,
-                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .tuner_type     = TUNER_TENA_9533_DI,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_remote     = 1,
-        #if 0
                 .has_radio      = 1,
-        #endif
         },
                 /* ---- card 0x8a ---------------------------------- */
         [BTTV_BOARD_PV_BT878P_2E] = {
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)