From cfbf086445b3ec8ce3c71ff4fd9ca26316e354cb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 4 Jul 2005 17:06:39 +0000 Subject: 2005-07-04 17:02 mchehab * saa7134-i2c.c: - specifying tuner type by parameter was not working. fixed. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/saa7134/saa7134-i2c.c | 6 +++--- v4l/ChangeLog | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index fae227bfe..4e2b17a8f 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-i2c.c,v 1.16 2005/07/03 13:41:38 mchehab Exp $ + * $Id: saa7134-i2c.c,v 1.17 2005/07/04 17:06:39 mchehab Exp $ * * device driver for philips saa7134 based TV cards * i2c interface support @@ -332,7 +332,7 @@ static u32 functionality(struct i2c_adapter *adap) static int attach_inform(struct i2c_client *client) { struct saa7134_dev *dev = client->adapter->algo_data; - /* int tuner = dev->tuner_type; */ + int tuner = dev->tuner_type; int conf = dev->tda9887_conf; struct tuner_addr tun_addr; @@ -353,7 +353,7 @@ static int attach_inform(struct i2c_client *client) } } - tun_addr.type = saa7134_boards[dev->board].tuner_type; + tun_addr.type = tuner; if (tun_addr.type != UNSET) { tun_addr.addr = saa7134_boards[dev->board].tuner_addr; if ((tun_addr.addr==ADDR_UNSET)||(tun_addr.addr==client->addr)) { diff --git a/v4l/ChangeLog b/v4l/ChangeLog index db95c4fdc..e244b8e97 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-07-04 17:02 mchehab + * saa7134-i2c.c: + - specifying tuner type by parameter was not working. fixed. + + Signed-off-by: Mauro Carvalho Chehab + 2005-07-04 11:47 mkrufky * Makefile, saa7134-dvb.c: - Let Kconfig decide whether to include -- cgit v1.2.3