diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-04-11 02:00:50 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-04-11 02:00:50 +0000 |
| commit | f24ceb1e6c7ff64cfd585e68ef0913af97974acf (patch) | |
| tree | 321175ffd44219a7c98e673d0e5fda7d054f00b9 | |
| parent | 9aa467176e1c71b2bf52876895cbd1023776d3b4 (diff) | |
Delete a doubly redundant call to timeout_del() in osiop_timeout.
First, the only way to get there was if the timeout fired, in which
case timeout_del() is a noop. Second, it will be called in
osiop_scsidone() for every active command when osiop_reset() is called
in osiop_timeout().
From mickey@
| -rw-r--r-- | sys/dev/ic/osiop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c index bf84e299da8..3d729514bd2 100644 --- a/sys/dev/ic/osiop.c +++ b/sys/dev/ic/osiop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: osiop.c,v 1.7 2003/04/09 02:30:32 krw Exp $ */ +/* $OpenBSD: osiop.c,v 1.8 2003/04/11 02:00:49 krw Exp $ */ /* $NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $ */ /* @@ -1953,8 +1953,6 @@ osiop_timeout(arg) /* reset the scsi bus */ osiop_resetbus(sc); - /* deactivate timeout */ - timeout_del(&xs->stimeout); acb->flags |= ACB_F_TIMEOUT; osiop_reset(sc); splx(s); |