1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 71b54094bda8..eb4833ee72be 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;
 }