summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/ami.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 27e12799c2c..fbf61ca67d7 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.195 2009/06/11 15:48:10 chl Exp $ */
+/* $OpenBSD: ami.c,v 1.196 2009/08/09 21:50:20 krw Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -1358,11 +1358,7 @@ ami_scsi_raw_cmd(struct scsi_xfer *xs)
ccb = ami_get_ccb(sc);
splx(s);
if (ccb == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
- s = splbio();
- scsi_done(xs);
- splx(s);
- return (COMPLETE);
+ return (NO_CCB);
}
memset(ccb->ccb_pt, 0, sizeof(struct ami_passthrough));
@@ -1493,11 +1489,7 @@ ami_scsi_cmd(struct scsi_xfer *xs)
ccb = ami_get_ccb(sc);
splx(s);
if (ccb == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
- s = splbio();
- scsi_done(xs);
- splx(s);
- return (COMPLETE);
+ return (NO_CCB);
}
ccb->ccb_xs = xs;
@@ -1603,11 +1595,7 @@ ami_scsi_cmd(struct scsi_xfer *xs)
ccb = ami_get_ccb(sc);
splx(s);
if (ccb == NULL) {
- xs->error = XS_DRIVER_STUFFUP;
- s = splbio();
- scsi_done(xs);
- splx(s);
- return (COMPLETE);
+ return (NO_CCB);
}
ccb->ccb_xs = xs;