diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 11 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index f251ab339..f82d38451 100644 --- a/linux/drivers/media/video/bttv-i2c.c +++ b/linux/drivers/media/video/bttv-i2c.c @@ -1,5 +1,5 @@ /* - $Id: bttv-i2c.c,v 1.29 2005/10/16 12:13:58 mchehab Exp $ + $Id: bttv-i2c.c,v 1.30 2005/10/26 19:46:25 mchehab Exp $ bttv-i2c.c -- all the i2c code is here @@ -298,6 +298,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", @@ -309,10 +313,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); } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index bf6e6b870..f8d47c440 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-26 19:42 mchehab + + * ../linux/drivers/media/video/bttv-i2c.c: (attach_inform): + - Fixed to accept radio devices like tea5767. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-10-26 12:59 mchehab * ../linux/drivers/usb/media/em2820-core.c: |