summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@linuxtv.org>2009-04-27 10:27:04 -0400
committerDevin Heitmueller <dheitmueller@linuxtv.org>2009-04-27 10:27:04 -0400
commit931c58dd0134b10194c570d8e5d47f774dd6fb5d (patch)
treebd7945a7b3e864be1efe45f9488f9fa8dcfbdec7 /linux
parent34efc2efeab79b43139454c4daeef94ff1b69f2c (diff)
downloadmediapointer-dvb-s2-931c58dd0134b10194c570d8e5d47f774dd6fb5d.tar.gz
mediapointer-dvb-s2-931c58dd0134b10194c570d8e5d47f774dd6fb5d.tar.bz2
cx23885: Two fixes for DViCO FusionHDTV DVB-T Dual Express
From: Christopher Pascoe <linuxdvb@itee.uq.edu.au> Two fixes for DViCO FusionHDTV DVB-T Dual Express: * Reset correct tuner when reinitializing xc3028. * Disable the I2C gate control to avoid locking up the I2C bus. Priority: high Signed-off-by: Christopher Pascoe <linuxdvb@itee.uq.edu.au> Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org> Tested-by: John Knops <jknops@australiaonline.net.au> Reviewed-By: Steven Toth <stoth@linuxtv.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-cards.c4
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-dvb.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-cards.c b/linux/drivers/media/video/cx23885/cx23885-cards.c
index 454470ffc..28f305dfd 100644
--- a/linux/drivers/media/video/cx23885/cx23885-cards.c
+++ b/linux/drivers/media/video/cx23885/cx23885-cards.c
@@ -442,9 +442,9 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP:
/* Two identical tuners on two different i2c buses,
* we need to reset the correct gpio. */
- if (port->nr == 0)
+ if (port->nr == 1)
bitmask = 0x01;
- else if (port->nr == 1)
+ else if (port->nr == 2)
bitmask = 0x04;
break;
}
diff --git a/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c
index c4c1d396c..119907f29 100644
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c
@@ -315,6 +315,7 @@ static struct zl10353_config dvico_fusionhdtv_xc3028 = {
.demod_address = 0x0f,
.if2 = 45600,
.no_tuner = 1,
+ .disable_i2c_gate_ctrl = 1,
};
static struct stv0900_config netup_stv0900_config = {