summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-10-26 19:46:25 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-10-26 19:46:25 +0000
commit2b8538f5d379b5b7e40a95f577be4f51418d2cfb (patch)
tree3832b25d848306b82fc52be067d7c5a5731f3782 /linux/drivers/media/video/bttv-i2c.c
parentb38c9a6d077809c53dd48fac3d862df8f5aac26a (diff)
downloadmediapointer-dvb-s2-2b8538f5d379b5b7e40a95f577be4f51418d2cfb.tar.gz
mediapointer-dvb-s2-2b8538f5d379b5b7e40a95f577be4f51418d2cfb.tar.bz2
- Fixed bttv to accept radio devices like tea5767.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/bttv-i2c.c')
-rw-r--r--linux/drivers/media/video/bttv-i2c.c11
1 files changed, 9 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);
}