diff options
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 32c9990b2..4adecb6a9 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1931,10 +1931,10 @@ static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core) * PCTV HD 800i with an xc5000 sillicon tuner. This is used for both * * analog tuner attach (tuner-core.c) and dvb tuner attach (cx88-dvb.c) */ -int cx88_tuner_callback(void *i2c_algo, int command, int arg) +int cx88_tuner_callback(void *priv, int command, int arg) { - struct i2c_algo_bit_data *algo = i2c_algo; - struct cx88_core *core = algo->data; + struct i2c_algo_bit_data *i2c_algo = priv; + struct cx88_core *core = i2c_algo->data; switch(core->boardnr) { case CX88_BOARD_PINNACLE_PCTV_HD_800i: @@ -1944,7 +1944,6 @@ int cx88_tuner_callback(void *i2c_algo, int command, int arg) cx_clear(MO_GP0_IO, 0x00000004); mdelay(200); cx_set(MO_GP0_IO, 0x00000004); - printk(KERN_ERR "xc5000: in reset for xc5000\n"); mdelay(200); return 0; } diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index f11865ec3..480ad4eac 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -386,7 +386,6 @@ static struct s5h1409_config pinnacle_pctv_hd_800i_config = { static struct xc5000_config pinnacle_pctv_hd_800i_tuner_config = { .i2c_address = 0x64, .if_khz = 5380, - /* cannot set .video_dev here, do it right before attach */ .tuner_callback = cx88_tuner_callback, }; @@ -655,7 +654,7 @@ static int dvb_register(struct cx8802_dev *dev) /* tuner_config.video_dev must point to * i2c_adap.algo_data */ - pinnacle_pctv_hd_800i_tuner_config.video_dev = + pinnacle_pctv_hd_800i_tuner_config.priv = dev->core->i2c_adap.algo_data; dvb_attach(xc5000_attach, dev->dvb.frontend, &dev->core->i2c_adap, |