diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-cards.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 3ba31572c657..254290975cdb 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1885,10 +1885,10 @@ static void dvico_fusionhdtv_hybrid_init(struct cx88_core *core) | |||
1885 | * PCTV HD 800i with an xc5000 sillicon tuner. This is used for both * | 1885 | * PCTV HD 800i with an xc5000 sillicon tuner. This is used for both * |
1886 | * analog tuner attach (tuner-core.c) and dvb tuner attach (cx88-dvb.c) */ | 1886 | * analog tuner attach (tuner-core.c) and dvb tuner attach (cx88-dvb.c) */ |
1887 | 1887 | ||
1888 | int cx88_tuner_callback(void *i2c_algo, int command, int arg) | 1888 | int cx88_tuner_callback(void *priv, int command, int arg) |
1889 | { | 1889 | { |
1890 | struct i2c_algo_bit_data *algo = i2c_algo; | 1890 | struct i2c_algo_bit_data *i2c_algo = priv; |
1891 | struct cx88_core *core = algo->data; | 1891 | struct cx88_core *core = i2c_algo->data; |
1892 | 1892 | ||
1893 | switch(core->boardnr) { | 1893 | switch(core->boardnr) { |
1894 | case CX88_BOARD_PINNACLE_PCTV_HD_800i: | 1894 | case CX88_BOARD_PINNACLE_PCTV_HD_800i: |
@@ -1898,7 +1898,6 @@ int cx88_tuner_callback(void *i2c_algo, int command, int arg) | |||
1898 | cx_clear(MO_GP0_IO, 0x00000004); | 1898 | cx_clear(MO_GP0_IO, 0x00000004); |
1899 | mdelay(200); | 1899 | mdelay(200); |
1900 | cx_set(MO_GP0_IO, 0x00000004); | 1900 | cx_set(MO_GP0_IO, 0x00000004); |
1901 | printk(KERN_ERR "xc5000: in reset for xc5000\n"); | ||
1902 | mdelay(200); | 1901 | mdelay(200); |
1903 | return 0; | 1902 | return 0; |
1904 | } | 1903 | } |