summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorJohannes Stezenbach <devnull@localhost>2005-07-24 22:39:54 +0000
committerJohannes Stezenbach <devnull@localhost>2005-07-24 22:39:54 +0000
commit4b04bf2726ef85286b4f8eba0d1201827da7645c (patch)
tree741deb5a4ac3da3ed8a14cbb9ffd888207ae0311 /linux
parent620f218e15c2fdabc3b36675ece2889bb30a8732 (diff)
downloadmediapointer-dvb-s2-4b04bf2726ef85286b4f8eba0d1201827da7645c.tar.gz
mediapointer-dvb-s2-4b04bf2726ef85286b4f8eba0d1201827da7645c.tar.bz2
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>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/dvb/frontends/cx24110.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24110.c b/linux/drivers/media/dvb/frontends/cx24110.c
index 555d472e4..71b54094b 100644
--- a/linux/drivers/media/dvb/frontends/cx24110.c
+++ b/linux/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);