From 820584ea205195139ca79c64c3607b11c43603e7 Mon Sep 17 00:00:00 2001 From: "Nickolay V. Shmyrev" Date: Mon, 31 Oct 2005 16:13:15 +0000 Subject: * ../linux/drivers/media/video/cx88/cx88-cards.c: * ../linux/drivers/media/video/cx88/cx88-cards.h: * ../linux/Documentation/video4linux/CARDLIST.cx88: - New Avermedia 303 card (without radio). Signed-off-by: Lubomir Bulej --- linux/drivers/media/video/bttv-i2c.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'linux/drivers/media/video/bttv-i2c.c') diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index 2b7980039..cfd8250af 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.34 2005/10/31 13:31:09 rmcc Exp $ + $Id: bttv-i2c.c,v 1.35 2005/10/31 16:13:15 nsh Exp $ bttv-i2c.c -- all the i2c code is here @@ -300,9 +300,9 @@ static int attach_inform(struct i2c_client *client) struct bttv *btv = i2c_get_adapdata(client->adapter); 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].tuner_addr) + addr = bttv_tvcards[btv->c.type].tuner_addr; if (bttv_debug) @@ -315,13 +315,13 @@ static int attach_inform(struct i2c_client *client) if (btv->tuner_type != UNSET) { struct tuner_setup tun_setup; - if ((addr==ADDR_UNSET) || + 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.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); + bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup); } } -- cgit v1.2.3