diff options
author | Ricardo Cerqueira <devnull@localhost> | 2005-10-31 13:31:09 +0000 |
---|---|---|
committer | Ricardo Cerqueira <devnull@localhost> | 2005-10-31 13:31:09 +0000 |
commit | 897b83cede00f69f9d44a8490b49b61d21b49308 (patch) | |
tree | 0233f08342d58ce1018a7edbbcdc8b239a01317c /linux | |
parent | 5fd502c1b11bc5f1e9223fc4bdc48880b16dcd20 (diff) | |
download | mediapointer-dvb-s2-897b83cede00f69f9d44a8490b49b61d21b49308.tar.gz mediapointer-dvb-s2-897b83cede00f69f9d44a8490b49b61d21b49308.tar.bz2 |
- Rollback recent i2c change to solve tuner detection breakage
- Fix in tuner-core to prevent setting the tuner type for an already configured tuner
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux')
-rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 24 | ||||
-rw-r--r-- | linux/drivers/media/video/tuner-core.c | 6 |
2 files changed, 17 insertions, 13 deletions
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index dca5ff2de..2b7980039 100644 --- a/linux/drivers/media/video/bttv-i2c.c +++ b/linux/drivers/media/video/bttv-i2c.c @@ -1,5 +1,5 @@ /* - $Id: bttv-i2c.c,v 1.33 2005/10/27 20:15:48 mchehab Exp $ + $Id: bttv-i2c.c,v 1.34 2005/10/31 13:31:09 rmcc Exp $ bttv-i2c.c -- all the i2c code is here @@ -298,10 +298,12 @@ 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; + 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) printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n", @@ -312,14 +314,16 @@ static int attach_inform(struct i2c_client *client) if (btv->tuner_type != UNSET) { struct tuner_setup tun_setup; - struct tuner *t = i2c_get_clientdata(client); - if (t->type != UNSET && t->mode_mask == T_RADIO) { - tun_setup.type = t->type; - tun_setup.mode_mask = T_RADIO; - tun_setup.addr = radio_addr; - client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); + if ((addr==ADDR_UNSET) || + (addr==client->addr)) { + + tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO; + tun_setup.type = btv->tuner_type; + tun_setup.addr = addr; + bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup); } + } return 0; diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index bc149e43d..bc165cdae 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.83 2005/10/27 20:15:48 mchehab Exp $ + * $Id: tuner-core.c,v 1.84 2005/10/31 13:31:09 rmcc Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -233,9 +233,9 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup) { 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)) || - tun_setup->addr == c->addr) { + tun_setup->addr == c->addr)) { set_type(c, tun_setup->type, tun_setup->mode_mask); } } |