Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[pandora-kernel.git] / drivers / media / video / bttv-i2c.c

diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index d6cccce..77619eb 100644 (file)
--- 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",
@@ -306,19 +308,17 @@ static int attach_inform(struct i2c_client *client)
        if (btv->tuner_type != UNSET) {
                struct tuner_setup tun_setup;
 
-               tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
-               tun_setup.type = btv->tuner_type;
-               tun_setup.addr = ADDR_UNSET;
+               if ((addr==ADDR_UNSET) ||
+                               (addr==client->addr)) {
 
-               if (client->addr == radio_addr)
-                       tun_setup.mode_mask =  T_RADIO;
+                       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);
+               }
 
-               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;
 }