]> err.no Git - linux-2.6/commitdiff
[PATCH] v4l: 865: fixed bttv to accept radio devices like tea5767
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>
Wed, 9 Nov 2005 05:38:16 +0000 (21:38 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:26 +0000 (07:56 -0800)
- Fixed bttv to accept radio devices like tea5767.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/bttv-i2c.c

index 06c5965b56161f8e0f340af6943fb0e005731466..d6cccce48041e789b0fd937b2184b6e255767515 100644 (file)
@@ -291,6 +291,10 @@ 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;
+
+       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",
@@ -302,10 +306,13 @@ static int attach_inform(struct i2c_client *client)
        if (btv->tuner_type != UNSET) {
                struct tuner_setup tun_setup;
 
-               tun_setup.mode_mask = T_RADIO | 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_UNSET;
 
+               if (client->addr == radio_addr)
+                       tun_setup.mode_mask =  T_RADIO;
+
                client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
        }