[PATCH] dvb: frontend: cx24110: clean up timeout handling.

Clean up timeout handling.

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

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index eb4833ee72b..d4b97989e3e 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -387,8 +387,9 @@ static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
 
 static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-        int rv, bit, i;
+        int rv, bit;
         struct cx24110_state *state = fe->demodulator_priv;
+        unsigned long timeout;
 
         if (burst == SEC_MINI_A)
                 bit = 0x00;
@@ -403,8 +404,9 @@ static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t
 
         rv = cx24110_readreg(state, 0x76);
         cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit));
-        for (i = 500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40) ; )
-              ; /* wait for LNB ready */
+        timeout = jiffies + msecs_to_jiffies(100);
+        while (!time_after(jiffies, timeout) && !(cx24110_readreg(state, 0x76) & 0x40))
+                ; /* wait for LNB ready */
 
         return 0;
 }
@@ -414,6 +416,7 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
 {
         int i, rv;
         struct cx24110_state *state = fe->demodulator_priv;
+        unsigned long timeout;
 
         for (i = 0; i < cmd->msg_len; i++)
                 cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
@@ -427,8 +430,9 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
         rv = cx24110_readreg(state, 0x76);
 
         cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40) | ((cmd->msg_len-3) & 3));
-        for (i=100; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);)
-                msleep(1); /* wait for LNB ready */
+        timeout = jiffies + msecs_to_jiffies(100);
+        while (!time_after(jiffies, timeout) && !(cx24110_readreg(state, 0x76) & 0x40))
+                ; /* wait for LNB ready */
 
         return 0;
 }