From b37b97ea3816232bec9ec8aae8f77932e4e8b625 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Wed, 14 Mar 2012 16:31:26 -0300
Subject: [PATCH] --- yaml --- r: 295104 b: refs/heads/master c:
 593a2ce0ae22188538d27933236a6acab57a0e65 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/dvb/frontends/m88rs2000.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 496d2a8af0da..30b3ba4e3fc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d535bd8829b18c6b5276d65f8f25e57dd0bcbed
+refs/heads/master: 593a2ce0ae22188538d27933236a6acab57a0e65
diff --git a/trunk/drivers/media/dvb/frontends/m88rs2000.c b/trunk/drivers/media/dvb/frontends/m88rs2000.c
index b0f4b9fcb15d..045ee5a6f7ae 100644
--- a/trunk/drivers/media/dvb/frontends/m88rs2000.c
+++ b/trunk/drivers/media/dvb/frontends/m88rs2000.c
@@ -228,8 +228,7 @@ static int m88rs2000_send_diseqc_burst(struct dvb_frontend *fe,
 	msleep(50);
 	reg0 = m88rs2000_demod_read(state, 0xb1);
 	reg1 = m88rs2000_demod_read(state, 0xb2);
-	if (burst == SEC_MINI_B)
-		reg1 |= 0x1;
+	/* TODO complete this section */
 	m88rs2000_demod_write(state, 0xb2, reg1);
 	m88rs2000_demod_write(state, 0xb1, reg0);
 	m88rs2000_demod_write(state, 0x9a, 0xb0);
@@ -251,13 +250,12 @@ static int m88rs2000_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
 	case SEC_TONE_ON:
 		reg0 |= 0x4;
 		reg0 &= 0xbc;
-	break;
+		break;
 	case SEC_TONE_OFF:
 		reg1 |= 0x80;
-	break;
-
+		break;
 	default:
-		return -EINVAL;
+		break;
 	}
 	m88rs2000_demod_write(state, 0xb2, reg1);
 	m88rs2000_demod_write(state, 0xb1, reg0);
@@ -292,6 +290,7 @@ struct inittab m88rs2000_setup[] = {
 	{DEMOD_WRITE, 0xf0, 0x22},
 	{DEMOD_WRITE, 0xf1, 0xbf},
 	{DEMOD_WRITE, 0xb0, 0x45},
+	{DEMOD_WRITE, 0xb2, 0x01}, /* set voltage pin always set 1*/
 	{DEMOD_WRITE, 0x9a, 0xb0},
 	{0xff, 0xaa, 0xff}
 };
@@ -520,9 +519,9 @@ static int m88rs2000_set_tuner_rf(struct dvb_frontend *fe)
 	int reg;
 	reg = m88rs2000_tuner_read(state, 0x3d);
 	reg &= 0x7f;
-	if (reg < 0x17)
+	if (reg < 0x16)
 		reg = 0xa1;
-	else if (reg < 0x16)
+	else if (reg == 0x16)
 		reg = 0x99;
 	else
 		reg = 0xf9;
@@ -901,5 +900,5 @@ EXPORT_SYMBOL(m88rs2000_attach);
 MODULE_DESCRIPTION("M88RS2000 DVB-S Demodulator driver");
 MODULE_AUTHOR("Malcolm Priestley tvboxspy@gmail.com");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("1.12");
+MODULE_VERSION("1.13");