aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bttv-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:38:16 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:26 -0500
commitaa8d5e72c3b2dbd18e494564345e84a0b890dd7b (patch)
tree39f51c3a2afca378a1b4ce6ae4ecbfb7d86a6439 /drivers/media/video/bttv-i2c.c
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/video/bttv-i2c.c')
-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 06c5965b5616..d6cccce48041 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 = {
291static int attach_inform(struct i2c_client *client) 291static int attach_inform(struct i2c_client *client)
292{ 292{
293 struct bttv *btv = i2c_get_adapdata(client->adapter); 293 struct bttv *btv = i2c_get_adapdata(client->adapter);
294 int radio_addr=ADDR_UNSET;
295
296 if (ADDR_UNSET != bttv_tvcards[btv->c.type].radio_addr)
297 radio_addr = bttv_tvcards[btv->c.type].radio_addr;
294 298
295 if (bttv_debug) 299 if (bttv_debug)
296 printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n", 300 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)
302 if (btv->tuner_type != UNSET) { 306 if (btv->tuner_type != UNSET) {
303 struct tuner_setup tun_setup; 307 struct tuner_setup tun_setup;
304 308
305 tun_setup.mode_mask = T_RADIO | T_ANALOG_TV | T_DIGITAL_TV; 309 tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
306 tun_setup.type = btv->tuner_type; 310 tun_setup.type = btv->tuner_type;
307 tun_setup.addr = ADDR_UNSET; 311 tun_setup.addr = ADDR_UNSET;
308 312
313 if (client->addr == radio_addr)
314 tun_setup.mode_mask = T_RADIO;
315
309 client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); 316 client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
310 } 317 }
311 318