summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2010-01-13 08:04:39 +0000
committerkrw <krw@openbsd.org>2010-01-13 08:04:39 +0000
commit30422a5b209284dac5a94d934c2e06be3a401cd8 (patch)
treeb4db5ca79a7014d119646f073da981d38ffbadaa
parentcleanup npppd code. delete IIJ local ifdef switches and fix warnings. (diff)
downloadwireguard-openbsd-30422a5b209284dac5a94d934c2e06be3a401cd8.tar.xz
wireguard-openbsd-30422a5b209284dac5a94d934c2e06be3a401cd8.zip
Cookie or done is set on entry to scsi_xs_sync(). Take panic() out
until we figure out why.
-rw-r--r--sys/scsi/scsi_base.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index de0eb8e9b4b..41f825598b3 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.160 2010/01/13 05:08:55 dlg Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.161 2010/01/13 08:04:39 krw Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -784,9 +784,6 @@ scsi_xs_sync(struct scsi_xfer *xs)
struct mutex cookie = MUTEX_INITIALIZER(IPL_BIO);
int error;
- if (xs->done != NULL || xs->cookie != NULL)
- panic("scsi_xs_sync: xs done or cookie is set!");
-
/*
* If we cant sleep while waiting for completion, get the adapter to
* complete it for us.