diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-04-02 23:12:51 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-04-02 23:12:51 +0000 |
| commit | 355b0c1a0eac78aa3e4d8cb9599838398c7e0b55 (patch) | |
| tree | 1c9ef94a2169bad5ec0f0daf46d3485f22bc59a7 /sys/dev | |
| parent | 0401da68729797d6cbda5b8b95aee24f31491d21 (diff) | |
Do not delete timeouts when they are not set
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/aha.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index bfd252bce3d..784051a1cb7 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.37 2001/01/29 06:40:14 mickey Exp $ */ +/* $OpenBSD: aha.c,v 1.38 2001/04/02 23:12:50 niklas Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -487,7 +487,8 @@ AGAIN: goto next; } - timeout_del(&ccb->xs->stimeout); + if ((ccb->xs->flags & SCSI_POLL) == 0) + timeout_del(&ccb->xs->stimeout); isadma_copyfrombuf((caddr_t)ccb, CCB_PHYS_SIZE, 1, ccb->ccb_phys); aha_done(sc, ccb); |