Commit 85a2eb07 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds

[PATCH] v4l: 867: correcting fixes to accept radio devices like tea5767

- Correcting fixes 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 e9d096dc
...@@ -291,11 +291,14 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = { ...@@ -291,11 +291,14 @@ 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; int radio_addr=ADDR_UNSET, addr=ADDR_UNSET;
if (ADDR_UNSET != bttv_tvcards[btv->c.type].radio_addr) if (ADDR_UNSET != bttv_tvcards[btv->c.type].radio_addr)
radio_addr = bttv_tvcards[btv->c.type].radio_addr; radio_addr = bttv_tvcards[btv->c.type].radio_addr;
if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
addr = bttv_tvcards[btv->c.type].tuner_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",
btv->c.nr,client->driver->name,client->addr, btv->c.nr,client->driver->name,client->addr,
...@@ -306,14 +309,20 @@ static int attach_inform(struct i2c_client *client) ...@@ -306,14 +309,20 @@ 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_ANALOG_TV | T_DIGITAL_TV; if ((addr==ADDR_UNSET)||(addr==client->addr)) {
tun_setup.type = btv->tuner_type; tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV;
tun_setup.addr = ADDR_UNSET; tun_setup.type = btv->tuner_type;
tun_setup.addr = ADDR_UNSET;
if (client->addr == radio_addr) client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
tun_setup.mode_mask = T_RADIO; }
if ((radio_addr==ADDR_UNSET)||(radio_addr==client->addr)) {
tun_setup.mode_mask = T_RADIO;
tun_setup.type = btv->tuner_type;
tun_setup.addr = ADDR_UNSET;
client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
}
} }
if (btv->pinnacle_id != UNSET) if (btv->pinnacle_id != UNSET)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment