diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 11:13:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 11:13:58 +0200 |
| commit | 6ef62164e794c480259ac158aa6c8c7b85746545 (patch) | |
| tree | c4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/dvb/bt8xx/dst.c | |
| parent | e75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/media/dvb/bt8xx/dst.c')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |