diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-09-04 04:57:15 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-09-04 04:57:15 +0000 |
| commit | 65b93c258bf156ae4199603a900a7d1106018b97 (patch) | |
| tree | 57026a13051f91c4d60de35a78e2a7bbc6a00f98 /sys/dev/ic/aac.c | |
| parent | af55e5eed6037a04aa342139803575fcce320c3c (diff) | |
Missing scsi_done() in some error path returning COMPLETE; ok dlg@
Diffstat (limited to 'sys/dev/ic/aac.c')
| -rw-r--r-- | sys/dev/ic/aac.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index 1c55359cd63..d3550e37e00 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac.c,v 1.39 2009/02/16 21:19:06 miod Exp $ */ +/* $OpenBSD: aac.c,v 1.40 2009/09/04 04:57:14 miod Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -111,7 +111,9 @@ int aac_alloc_commands(struct aac_softc *); void aac_free_commands(struct aac_softc *); void aac_unmap_command(struct aac_command *); +#if 0 int aac_raw_scsi_cmd(struct scsi_xfer *); +#endif int aac_scsi_cmd(struct scsi_xfer *); void aac_startio(struct aac_softc *); void aac_startup(struct aac_softc *); @@ -128,9 +130,11 @@ struct scsi_adapter aac_switch = { aac_scsi_cmd, aacminphys, 0, 0, }; +#if 0 struct scsi_adapter aac_raw_switch = { aac_raw_scsi_cmd, aacminphys, 0, 0, }; +#endif struct scsi_device aac_dev = { NULL, NULL, NULL, NULL @@ -2505,19 +2509,27 @@ aacminphys(struct buf *bp, struct scsi_link *sl) minphys(bp); } +#if 0 int aac_raw_scsi_cmd(struct scsi_xfer *xs) { #ifdef AAC_DEBUG struct aac_softc *sc = xs->sc_link->adapter_softc; #endif + int s; + AAC_DPRINTF(AAC_D_CMD, ("%s: aac_raw_scsi_cmd\n", sc->aac_dev.dv_xname)); /* XXX Not yet implemented */ xs->error = XS_DRIVER_STUFFUP; + xs->flags |= ITSDONE; + s = splbio(); + scsi_done(xs); + splx(s); return (COMPLETE); } +#endif int aac_scsi_cmd(struct scsi_xfer *xs) |