diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-01-23 01:41:45 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-01-23 01:41:45 +0000 |
commit | ff6f27f968c3314d57e925b9c002c1c9b4344fda (patch) | |
tree | d0bdbba8d0ed9d04ba81a60b1ff3f2d26dcd6eb4 /sys/dev/sdmmc | |
parent | 89a4ab6c9c05d9ecaa674b0d4b304ef763151981 (diff) |
if cold, do not use tsleep, but use the delay path.
Such as during DVACT_RESUME...
ok guenther kettenis
Diffstat (limited to 'sys/dev/sdmmc')
-rw-r--r-- | sys/dev/sdmmc/sdmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c index 3184278f280..612aec68db4 100644 --- a/sys/dev/sdmmc/sdmmc.c +++ b/sys/dev/sdmmc/sdmmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc.c,v 1.31 2013/12/21 17:10:08 deraadt Exp $ */ +/* $OpenBSD: sdmmc.c,v 1.32 2014/01/23 01:41:44 deraadt Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -552,7 +552,7 @@ sdmmc_delay(u_int usecs) { int ticks = usecs / (1000000 / hz); - if (ticks > 0) + if (!cold && ticks > 0) tsleep(&sdmmc_delay, PWAIT, "mmcdly", ticks); else delay(usecs); |