[PATCH] dvb: frontend: cx24110: DiSEqC fix

Fix DiSEqC switching (one bug fix suggested by Peter Hettkamp, and one
experimentally determined msleep(30) suggested by Adam Szalkowski).

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 555d472e42dededf18c564a6ab0e63c53fbbbe87..71b54094bda8a6a1d6745e81e0b6340c96be92d0 100644 (file)
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -398,7 +398,7 @@ 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);
+       cx24110_writereg(state, 0x77, rv | 0x04);
 
        rv = cx24110_readreg(state, 0x76);
        cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit));
@@ -418,7 +418,8 @@ 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);
+       cx24110_writereg(state, 0x77, rv & ~0x04);
+       msleep(30); /* reportedly fixes switching problems */
 
        rv = cx24110_readreg(state, 0x76);