summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2010-03-28 09:08:33 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2010-03-28 09:08:33 +0000
commit2918e4aff57db7cc20502c2155722266be6bb255 (patch)
tree9f26410c33f231e7612ba29912a8b2684e34fc9d
parent20f6c9860dce66c41a2c836a7fbb207b53dbec66 (diff)
Replace a scsi_done() call with sr_scsi_done() which fixes a missing
splx() call. Found by jsg@ using the clang static analyser. ok marco@
-rw-r--r--sys/dev/softraid.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index ecfc135cc7c..9c0aee7ea98 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.198 2010/03/27 16:20:29 jsing Exp $ */
+/* $OpenBSD: softraid.c,v 1.199 2010/03/28 09:08:32 jsing Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1870,8 +1870,7 @@ sr_scsi_cmd(struct scsi_xfer *xs)
if ((wu = sr_wu_get(sd, 0)) == NULL) {
DNPRINTF(SR_D_CMD, "%s: sr_scsi_cmd no wu\n", DEVNAME(sc));
xs->error = XS_NO_CCB;
- s = splbio();
- scsi_done(xs);
+ sr_scsi_done(sd, xs);
return;
}