summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2003-04-11 02:00:49 +0000
committerkrw <krw@openbsd.org>2003-04-11 02:00:49 +0000
commit8abb6e88c71c75461492d8a5b3d2e9addac8316c (patch)
treef04d603bea0fa883af3cfbbb4acb896c1ec4a954 /sys/dev
parentzombies can't live allproc list. art fixed the real problem a while ago. (diff)
downloadwireguard-openbsd-8abb6e88c71c75461492d8a5b3d2e9addac8316c.tar.xz
wireguard-openbsd-8abb6e88c71c75461492d8a5b3d2e9addac8316c.zip
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@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/osiop.c4
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);