tree adc52c99f6059e8772d53c7d9c912db190bc8c92
parent d897275500d8fac919a11073eb587ce0e3fcc36c
author Adam Szalkowski <[EMAIL PROTECTED]> Sat, 10 Sep 2005 03:02:35 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sat, 10 Sep 2005 03:57:39 -0700

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

Fix DiSEqC problems.

Signed-off-by: Adam Szalkowski <[EMAIL PROTECTED]>
Signed-off-by: Johannes Stezenbach <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 drivers/media/dvb/frontends/cx24110.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/media/dvb/frontends/cx24110.c 
b/drivers/media/dvb/frontends/cx24110.c
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -398,7 +398,8 @@ static int cx24110_diseqc_send_burst(str
                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(struc
                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;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to