Browse Source

V4L/DVB (11594): stv090x: Fix incorrect TSMODE usage

Signed-off-by: Andreas Regel <andreas.regel@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Andreas Regel 16 years ago
parent
commit
64104dc901
2 changed files with 10 additions and 10 deletions
  1. 8 8
      drivers/media/dvb/frontends/stv090x.c
  2. 2 2
      drivers/media/dvb/ttpci/budget-ci.c

+ 8 - 8
drivers/media/dvb/frontends/stv090x.c

@@ -3813,34 +3813,34 @@ static int stv090x_set_tspath(struct stv090x_state *state)
 
 	switch (state->config->ts2_mode) {
 	case STV090x_TSMODE_PARALLEL_PUNCTURED:
-		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);
+		reg = stv090x_read_reg(state, STV090x_P2_TSCFGH);
 		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x00);
 		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x00);
-		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)
+		if (stv090x_write_reg(state, STV090x_P2_TSCFGH, reg) < 0)
 			goto err;
 		break;
 
 	case STV090x_TSMODE_DVBCI:
-		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);
+		reg = stv090x_read_reg(state, STV090x_P2_TSCFGH);
 		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x00);
 		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x01);
-		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)
+		if (stv090x_write_reg(state, STV090x_P2_TSCFGH, reg) < 0)
 			goto err;
 		break;
 
 	case STV090x_TSMODE_SERIAL_PUNCTURED:
-		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);
+		reg = stv090x_read_reg(state, STV090x_P2_TSCFGH);
 		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x01);
 		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x00);
-		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)
+		if (stv090x_write_reg(state, STV090x_P2_TSCFGH, reg) < 0)
 			goto err;
 		break;
 
 	case STV090x_TSMODE_SERIAL_CONTINUOUS:
-		reg = stv090x_read_reg(state, STV090x_P1_TSCFGH);
+		reg = stv090x_read_reg(state, STV090x_P2_TSCFGH);
 		STV090x_SETFIELD_Px(reg, TSFIFO_SERIAL_FIELD, 0x01);
 		STV090x_SETFIELD_Px(reg, TSFIFO_DVBCI_FIELD, 0x01);
-		if (stv090x_write_reg(state, STV090x_P1_TSCFGH, reg) < 0)
+		if (stv090x_write_reg(state, STV090x_P2_TSCFGH, reg) < 0)
 			goto err;
 		break;
 

+ 2 - 2
drivers/media/dvb/ttpci/budget-ci.c

@@ -1358,8 +1358,8 @@ static struct stv090x_config tt1600_stv090x_config = {
 	.address		= 0x68,
 	.ref_clk		= 27000000,
 
-	.ts1_mode		= STV090x_TSMODE_DVBCI,
-	.ts2_mode		= STV090x_TSMODE_DVBCI,
+	.ts1_mode		= STV090x_TSMODE_PARALLEL_PUNCTURED,
+	.ts2_mode		= STV090x_TSMODE_SERIAL_PUNCTURED,
 
 	.repeater_level		= STV090x_RPTLEVEL_16,