3 files changed, 6 insertions, 4 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index f9d087669d5..4eed783f4bc 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -137,7 +137,8 @@ static int flexcop_send_diseqc_msg(struct dvb_frontend* fe, int len, u8 *msg, un
                         flexcop_diseqc_send_byte(fe, 0xff);
                 else {
                         flexcop_set_tone(fe, SEC_TONE_ON);
-                        udelay(12500);
+                        mdelay(12);
+                        udelay(500);
                         flexcop_set_tone(fe, SEC_TONE_OFF);
                 }
                 msleep(20);
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index a7637562e74..aa3db57d32d 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1244,7 +1244,7 @@ static int dst_command(struct dst_state *state, u8 *data, u8 len)
                 goto error;
         }
         if (state->type_flags & DST_TYPE_HAS_FW_1)
-                udelay(3000);
+                mdelay(3);
         if (read_dst(state, &reply, GET_ACK)) {
                 dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");
                 if ((dst_error_recovery(state)) < 0) {
@@ -1260,7 +1260,7 @@ static int dst_command(struct dst_state *state, u8 *data, u8 len)
         if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3))
                 goto error;
         if (state->type_flags & DST_TYPE_HAS_FW_1)
-                udelay(3000);
+                mdelay(3);
         else
                 udelay(2000);
         if (!dst_wait_dst_ready(state, NO_DELAY))
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 9001de23332..6081edc362d 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -4039,7 +4039,8 @@ static void __devinit boot_msp34xx(struct bttv *btv, int pin)
 
         gpio_inout(mask,mask);
         gpio_bits(mask,0);
-        udelay(2500);
+        mdelay(2);
+        udelay(500);
         gpio_bits(mask,mask);
 
         if (bttv_gpio)