diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-09 04:21:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-09 04:21:59 +0000 |
| commit | 134cc97223d3c6df572503ed8f3409faf0be6b5b (patch) | |
| tree | 43fd89e7bdee6d077b9c1fa9670e470069f10108 /sys/dev/ic/lpt.c | |
| parent | 6ae0c14a85be916efae689713a243482b7fcf54f (diff) | |
timeout_del unconditionally
Diffstat (limited to 'sys/dev/ic/lpt.c')
| -rw-r--r-- | sys/dev/ic/lpt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c index 8d623901128..235940e3868 100644 --- a/sys/dev/ic/lpt.c +++ b/sys/dev/ic/lpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt.c,v 1.10 2013/06/12 19:07:40 deraadt Exp $ */ +/* $OpenBSD: lpt.c,v 1.11 2013/12/09 04:21:58 deraadt Exp $ */ /* $NetBSD: lpt.c,v 1.42 1996/10/21 22:41:14 thorpej Exp $ */ /* @@ -433,8 +433,7 @@ lpt_activate(struct device *self, int act) switch (act) { case DVACT_SUSPEND: - if (timeout_pending(&sc->sc_wakeup_tmo)) - timeout_del(&sc->sc_wakeup_tmo); + timeout_del(&sc->sc_wakeup_tmo); break; case DVACT_RESUME: bus_space_write_1(sc->sc_iot, sc->sc_ioh, lpt_control, LPC_NINIT); |