diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-07-02 15:24:11 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-07-02 15:24:11 +0000 |
| commit | a3a954f470bc6f2ce8de3296cae025627f5b0c6a (patch) | |
| tree | 058624cf74c66ede5d28f5bf4f865d3746ac891d /linux/drivers/media/video/saa7134/saa7134-i2c.c | |
| parent | ec7f541e384c249c0f5a2c415b95c900bb272c44 (diff) | |
| download | mediapointer-dvb-s2-a3a954f470bc6f2ce8de3296cae025627f5b0c6a.tar.gz mediapointer-dvb-s2-a3a954f470bc6f2ce8de3296cae025627f5b0c6a.tar.bz2 | |
* bttv-cards.c, bttv-i2c.c, cx88-i2c.c, cx88-video.c:
* saa7134-cards.c, saa7134-core.c, saa7134-i2c.c:
* tuner-core.c, tuner.h:
Rename v4l2_tuner field in tun_addr structure. Cleanup
tuner private calls.
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, 5 insertions, 8 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index abb8a75fd..587f6cc06 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.14 2005/06/28 23:41:47 mkrufky Exp $ + * $Id: saa7134-i2c.c,v 1.15 2005/07/02 15:24:11 nsh Exp $ * * device driver for philips saa7134 based TV cards * i2c interface support @@ -338,21 +338,18 @@ static int attach_inform(struct i2c_client *client) tun_addr.type = saa7134_boards[dev->board].radio_type; if (tun_addr.type != UNSET) { - tun_addr.v4l2_tuner = T_RADIO; + tun_addr.state = T_RADIO; tun_addr.addr = saa7134_boards[dev->board].radio_addr; saa7134_i2c_call_clients(dev,TUNER_SET_TYPE_ADDR,&tun_addr); } - tun_addr.v4l2_tuner = T_ANALOG_TV; + tun_addr.state = T_ANALOG_TV; tun_addr.type = saa7134_boards[dev->board].tuner_type; tun_addr.addr = saa7134_boards[dev->board].tuner_addr; - if (tun_addr.addr != ADDR_UNSET) - saa7134_i2c_call_clients(dev,TUNER_SET_TYPE_ADDR,&tun_addr); - else - saa7134_i2c_call_clients(dev,TUNER_SET_TYPE,&tuner); - + saa7134_i2c_call_clients(dev,TUNER_SET_TYPE_ADDR, &tun_addr); saa7134_i2c_call_clients(dev,TDA9887_SET_CONFIG,&conf); + return 0; } |