diff options
-rw-r--r-- | drivers/media/dvb/frontends/stv0297.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c index e681263bf079..928aca052afe 100644 --- a/drivers/media/dvb/frontends/stv0297.c +++ b/drivers/media/dvb/frontends/stv0297.c | |||
@@ -617,7 +617,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
617 | 617 | ||
618 | /* wait for WGAGC lock */ | 618 | /* wait for WGAGC lock */ |
619 | starttime = jiffies; | 619 | starttime = jiffies; |
620 | timeout = jiffies + (200 * HZ) / 1000; | 620 | timeout = jiffies + msecs_to_jiffies(2000); |
621 | while (time_before(jiffies, timeout)) { | 621 | while (time_before(jiffies, timeout)) { |
622 | msleep(10); | 622 | msleep(10); |
623 | if (stv0297_readreg(state, 0x43) & 0x08) | 623 | if (stv0297_readreg(state, 0x43) & 0x08) |
@@ -629,7 +629,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
629 | msleep(20); | 629 | msleep(20); |
630 | 630 | ||
631 | /* wait for equaliser partial convergence */ | 631 | /* wait for equaliser partial convergence */ |
632 | timeout = jiffies + (50 * HZ) / 1000; | 632 | timeout = jiffies + msecs_to_jiffies(500); |
633 | while (time_before(jiffies, timeout)) { | 633 | while (time_before(jiffies, timeout)) { |
634 | msleep(10); | 634 | msleep(10); |
635 | 635 | ||
@@ -642,7 +642,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
642 | } | 642 | } |
643 | 643 | ||
644 | /* wait for equaliser full convergence */ | 644 | /* wait for equaliser full convergence */ |
645 | timeout = jiffies + (delay * HZ) / 1000; | 645 | timeout = jiffies + msecs_to_jiffies(delay); |
646 | while (time_before(jiffies, timeout)) { | 646 | while (time_before(jiffies, timeout)) { |
647 | msleep(10); | 647 | msleep(10); |
648 | 648 | ||
@@ -659,7 +659,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
659 | stv0297_writereg_mask(state, 0x88, 8, 0); | 659 | stv0297_writereg_mask(state, 0x88, 8, 0); |
660 | 660 | ||
661 | /* wait for main lock */ | 661 | /* wait for main lock */ |
662 | timeout = jiffies + (20 * HZ) / 1000; | 662 | timeout = jiffies + msecs_to_jiffies(20); |
663 | while (time_before(jiffies, timeout)) { | 663 | while (time_before(jiffies, timeout)) { |
664 | msleep(10); | 664 | msleep(10); |
665 | 665 | ||