diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-07-05 17:37:35 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-07-05 17:37:35 +0000 |
| commit | 1f40d1644d3d1f28c93be46a75081421aaefb80e (patch) | |
| tree | 83a33bfca94e034d19a75bb5ebafea1fb6001af0 /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | e878ee9ed558c1eb13033b79cdaebf4145865efa (diff) | |
| download | mediapointer-dvb-s2-1f40d1644d3d1f28c93be46a75081421aaefb80e.tar.gz mediapointer-dvb-s2-1f40d1644d3d1f28c93be46a75081421aaefb80e.tar.bz2 | |
Rename tuner structures fields. Move MD detection hack to
saa7134-cards.c
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 350e63db7..fc6432e99 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.76 2005/07/04 16:05:50 mkrufky Exp $ + * $Id: cx88-video.c,v 1.77 2005/07/05 17:37:35 nsh Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2025,7 +2025,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, struct cx8800_dev *dev; struct cx88_core *core; #if 0 - struct tuner_addr tun_addr; + struct tuner_setup tun_setup; #endif int err; @@ -2102,18 +2102,18 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, request_module("tda9887"); #if 0 /* cx88-i2c has already this function */ if (core->radio_type != UNSET) { - tun_addr.state = T_RADIO; - tun_addr.type = core->radio_type; - tun_addr.addr = core->radio_addr; - cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE_ADDR, &tun_addr); + tun_setup.mode_mask = T_RADIO; + tun_setup.type = core->radio_type; + tun_setup.addr = core->radio_addr; + cx88_call_i2c_clients (dev->core, TUNER_SET_TYPE_ADDR, &tun_setup); } if (core->tuner_type != UNSET) { - tun_addr.state = T_ANALOG_TV; - tun_addr.type = core->tuner_type; - tun_addr.addr = core->tuner_addr; + tun_setup.mode_mask = T_ANALOG_TV; + tun_setup.type = core->tuner_type; + tun_setup.addr = core->tuner_addr; - cx88_call_i2c_clients(dev->core,TUNER_SET_TYPE_ADDR, &tun_addr); + cx88_call_i2c_clients(dev->core, TUNER_SET_TYPE_ADDR, &tun_setup); } if (core->tda9887_conf) |