aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-08 21:38:16 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:26 -0800
commitaa8d5e72c3b2dbd18e494564345e84a0b890dd7b (patch)
tree39f51c3a2afca378a1b4ce6ae4ecbfb7d86a6439 /drivers/media
parentfeff0485ebcf05b5af8a3c82aa5c361d9f8b6e75 (diff)
[PATCH] v4l: 865: fixed bttv to accept radio devices like tea5767
- 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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/bttv-i2c.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 06c5965b561..d6cccce4804 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -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);
}