diff options
| author |   krw <krw@openbsd.org> | 2009-08-09 21:50:20 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2009-08-09 21:50:20 +0000 |
| commit | d7ae38fa8c202fef8a5db5a86e08d3a6720c3fb2 (patch) | |
| tree | c4b68224c489061b4647bf3478b7b2273e122058 | |
| parent | sync to 1.8.4: correct error message to complain about .An line arguments (diff) | |
| download | wireguard-openbsd-d7ae38fa8c202fef8a5db5a86e08d3a6720c3fb2.tar.xz wireguard-openbsd-d7ae38fa8c202fef8a5db5a86e08d3a6720c3fb2.zip | |
Make ami(4) use NO_CCB at least some of the time.
"Should never happen but I like it" marco@
| -rw-r--r-- | sys/dev/ic/ami.c | 20 |
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; |