diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:04:46 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:04:46 -0200 |
| commit | 37ec66afc95aef6493a0f3617b1f5fff6bbef7cd (patch) | |
| tree | a1ce6bf55008043cb777496cd2b120d8335c963c /linux/drivers/media/video/saa7134/saa7134-i2c.c | |
| parent | b296024463558f0e9fe5dff04fdfd91903f15bd5 (diff) | |
| parent | 8d0865f57c653ef13eb27ce8ca78901ba6058d57 (diff) | |
| download | mediapointer-dvb-s2-37ec66afc95aef6493a0f3617b1f5fff6bbef7cd.tar.gz mediapointer-dvb-s2-37ec66afc95aef6493a0f3617b1f5fff6bbef7cd.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb-fixes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-i2c.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index 43f02f5f3..15e43bd40 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -328,7 +328,6 @@ static int attach_inform(struct i2c_client *client) { struct saa7134_dev *dev = client->adapter->algo_data; int tuner = dev->tuner_type; - int conf = dev->tda9887_conf; struct tuner_setup tun_setup; d1printk( "%s i2c attach [addr=0x%x,client=%s]\n", @@ -373,7 +372,6 @@ static int attach_inform(struct i2c_client *client) } if (tuner != UNSET) { - tun_setup.type = tuner; tun_setup.addr = saa7134_boards[dev->board].tuner_addr; tun_setup.config = saa7134_boards[dev->board].tuner_config; @@ -385,9 +383,18 @@ static int attach_inform(struct i2c_client *client) client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup); } + + if (tuner == TUNER_TDA9887) { + struct v4l2_priv_tun_config tda9887_cfg; + + tda9887_cfg.tuner = TUNER_TDA9887; + tda9887_cfg.priv = &dev->tda9887_conf; + + client->driver->command(client, TUNER_SET_CONFIG, + &tda9887_cfg); + } } - client->driver->command(client, TDA9887_SET_CONFIG, &conf); return 0; } |