summaryrefslogtreecommitdiff
path: root/sys/dev/isa/aps.c
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2008-05-22 19:23:05 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2008-05-22 19:23:05 +0000
commit299d77765f417e3a779dd9cd6e906cc968af3cc7 (patch)
tree8b8e4b7113a11a6646e6a64275dfd7803a28b867 /sys/dev/isa/aps.c
parent4f30c327603d94a432699cc5bd567fe54df11f97 (diff)
More timeout(9) usage cleaned up.
ok claudio
Diffstat (limited to 'sys/dev/isa/aps.c')
-rw-r--r--sys/dev/isa/aps.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c
index 03bd0089b53..043b082618f 100644
--- a/sys/dev/isa/aps.c
+++ b/sys/dev/isa/aps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
+/* $OpenBSD: aps.c,v 1.16 2008/05/22 19:23:04 mk Exp $ */
/*
* Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
*
@@ -392,8 +392,7 @@ aps_power(int why, void *arg)
bus_space_handle_t ioh = sc->aps_ioh;
if (why != PWR_RESUME) {
- if (timeout_pending(&aps_timeout))
- timeout_del(&aps_timeout);
+ timeout_del(&aps_timeout);
} else {
/*
* Redo the init sequence on resume, because APS is