lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] v4l: 893: rollback recent i2c change to solve tuner detection breakage

Browse Source 
- Rollback recent i2c change to solve tuner detection breakage

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
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>
This commit is contained in:
Ricardo Cerqueira
2005-11-08 21:38:33 -08:00
committed by Linus Torvalds
parent d0fcdd7815
commit 291d1d7356
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/video/bttv-i2c.c
View File

@@ -291,10 +291,12 @@ 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 addr=ADDR_UNSET;
if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
addr = bttv_tvcards[btv->c.type].tuner_addr;
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",
@@ -305,14 +307,16 @@ 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;
struct tuner *t = i2c_get_clientdata(client);
if (t->type != UNSET && t->mode_mask == T_RADIO) { if ((addr==ADDR_UNSET) ||
tun_setup.type = t->type; (addr==client->addr)) {
tun_setup.mode_mask = T_RADIO;
tun_setup.addr = radio_addr; tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); tun_setup.type = btv->tuner_type;
tun_setup.addr = addr;
bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
} }
} }
return 0; return 0;

4
drivers/media/video/tuner-core.c
View File

@@ -222,9 +222,9 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup)
{ {
struct tuner *t = i2c_get_clientdata(c); struct tuner *t = i2c_get_clientdata(c);
if ((tun_setup->addr == ADDR_UNSET && if ( t->type == UNSET && ((tun_setup->addr == ADDR_UNSET &&
(t->mode_mask & tun_setup->mode_mask)) || (t->mode_mask & tun_setup->mode_mask)) ||
tun_setup->addr == c->addr) { tun_setup->addr == c->addr)) {
set_type(c, tun_setup->type, tun_setup->mode_mask); set_type(c, tun_setup->type, tun_setup->mode_mask);
} }
} }