From: Adam Szalkowski <adamsz@gmx.net>
Date: Fri, 9 Sep 2005 20:02:35 +0000 (-0700)
Subject: [PATCH] dvb: frontend: cx24110: another DiSEqC fix
X-Git-Tag: v2.6.14-rc1~420
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=296c786a0d2122b1e47c80ca717d8a8ac36402c1;p=~emulex%2Finfiniband.git

[PATCH] dvb: frontend: cx24110: another DiSEqC fix

Fix DiSEqC problems.

Signed-off-by: Adam Szalkowski <adam@szalkowski.de>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 71b54094bda..eb4833ee72b 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -398,7 +398,8 @@ static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
 		return -EINVAL;
 
 	rv = cx24110_readreg(state, 0x77);
-	cx24110_writereg(state, 0x77, rv | 0x04);
+	if (!(rv & 0x04))
+		cx24110_writereg(state, 0x77, rv | 0x04);
 
 	rv = cx24110_readreg(state, 0x76);
 	cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit));
@@ -418,14 +419,16 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
 		cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
 
 	rv = cx24110_readreg(state, 0x77);
-	cx24110_writereg(state, 0x77, rv & ~0x04);
-	msleep(30); /* reportedly fixes switching problems */
+	if (rv & 0x04) {
+		cx24110_writereg(state, 0x77, rv & ~0x04);
+		msleep(30); /* reportedly fixes switching problems */
+	}
 
 	rv = cx24110_readreg(state, 0x76);
 
 	cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40) | ((cmd->msg_len-3) & 3));
-	for (i=500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);)
-		; /* wait for LNB ready */
+	for (i=100; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);)
+		msleep(1); /* wait for LNB ready */
 
 	return 0;
 }