Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa8d5e72 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: 865: fixed bttv to accept radio devices like tea5767



- Fixed bttv to accept radio devices like tea5767.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent feff0485
Loading
Loading
Loading
Loading
+8 −1
Original line number Original line Diff line number Diff line
@@ -291,6 +291,10 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
static int attach_inform(struct i2c_client *client)
static int attach_inform(struct i2c_client *client)
{
{
	struct bttv *btv = i2c_get_adapdata(client->adapter);
	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)
	if (bttv_debug)
		printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
		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) {
	if (btv->tuner_type != UNSET) {
		struct tuner_setup tun_setup;
		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.type = btv->tuner_type;
		tun_setup.addr = ADDR_UNSET;
		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);
		client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
	}
	}