summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-03-06 01:28:45 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-03-06 01:28:45 +0000
commit69a85006ff1fc2798efd8730733f6e20ee5eaf41 (patch)
treecdf70b869b0165e7d698643456b49d43ee288e04
parent74bda0dc265c77d54121fd81eff2e117dd94b84f (diff)
Bring NO_CCB to mpi.
ok marco@
-rw-r--r--sys/dev/ic/mpi.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index b79dc020c23..6433d51cc6e 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpi.c,v 1.109 2009/02/16 21:19:07 miod Exp $ */
+/* $OpenBSD: mpi.c,v 1.110 2009/03/06 01:28:44 krw Exp $ */
/*
* Copyright (c) 2005, 2006 David Gwynne <dlg@openbsd.org>
@@ -1124,13 +1124,9 @@ mpi_scsi_cmd(struct scsi_xfer *xs)
s = splbio();
ccb = mpi_get_ccb(sc);
splx(s);
- if (ccb == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
- s = splbio();
- scsi_done(xs);
- splx(s);
- return (COMPLETE);
- }
+ if (ccb == NULL)
+ return (NO_CCB);
+
DNPRINTF(MPI_D_CMD, "%s: ccb_id: %d xs->flags: 0x%x\n",
DEVNAME(sc), ccb->ccb_id, xs->flags);