diff options
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-i2c.c | 20 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index 7f1f4a6c5..8403c4e95 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -1,5 +1,5 @@ /* - $Id: cx88-i2c.c,v 1.27 2005/07/03 13:41:38 mchehab Exp $ + $Id: cx88-i2c.c,v 1.28 2005/07/05 17:37:35 nsh Exp $ cx88-i2c.c -- all the i2c code is here @@ -91,7 +91,7 @@ static int cx8800_bit_getsda(void *data) static int attach_inform(struct i2c_client *client) { - struct tuner_addr tun_addr; + struct tuner_setup tun_setup; struct cx88_core *core = i2c_get_adapdata(client->adapter); dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", @@ -101,21 +101,21 @@ static int attach_inform(struct i2c_client *client) if (core->radio_type != UNSET) { if ((core->radio_addr==ADDR_UNSET)||(core->radio_addr==client->addr)) { - tun_addr.state = T_RADIO; - tun_addr.type = core->radio_type; - tun_addr.addr = core->radio_addr; + tun_setup.mode_mask = T_RADIO; + tun_setup.type = core->radio_type; + tun_setup.addr = core->radio_addr; - client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_addr); + client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup); } } if (core->tuner_type != UNSET) { if ((core->tuner_addr==ADDR_UNSET)||(core->tuner_addr==client->addr)) { - 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; - client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_addr); + client->driver->command (client,TUNER_SET_TYPE_ADDR, &tun_setup); } } 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) |