diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1998-12-22 18:14:50 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1998-12-22 18:14:50 +0000 |
| commit | e84c798977919ed0f7e2c1f97745cb98dc2a6764 (patch) | |
| tree | fcb6262499255e1496532889b51bf6f6d8dea660 /sys/dev/aha | |
| parent | b2608b2c738b759e57a007fdc921f47d3ff54cf8 (diff) | |
Notes
Diffstat (limited to 'sys/dev/aha')
| -rw-r--r-- | sys/dev/aha/aha.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index 4d9df2ffa22b..2478c8c775b0 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -55,7 +55,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aha.c,v 1.15 1998/12/13 00:05:04 gibbs Exp $ + * $Id: aha.c,v 1.16 1998/12/15 02:51:54 imp Exp $ */ #include <sys/param.h> @@ -720,10 +720,10 @@ aha_find_probe_range(int ioport, int *port_index, int *max_port_index) break; if ((i >= AHA_NUM_ISAPORTS) || (ioport != aha_isa_ports[i].addr)) { - printf(" -aha_isa_probe: Invalid baseport of 0x%x specified. -aha_isa_probe: Nearest valid baseport is 0x%x. -aha_isa_probe: Failing probe.\n", + printf("\n" +"aha_isa_probe: Invalid baseport of 0x%x specified.\n" +"aha_isa_probe: Nearest valid baseport is 0x%x.\n" +"aha_isa_probe: Failing probe.\n", ioport, (i < AHA_NUM_ISAPORTS) ? aha_isa_ports[i].addr @@ -1360,13 +1360,16 @@ ahadone(struct aha_softc *aha, struct aha_ccb *accb, aha_mbi_comp_code_t comp_co case AMBI_ABORT: case AMBI_ERROR: /* An error occured */ + csio->resid = aha_a24tou(accb->hccb.data_len); switch(accb->hccb.ahastat) { case AHASTAT_DATARUN_ERROR: - if (aha_a24tou(accb->hccb.data_len) <= 0) { + { + if (csio->resid <= 0) { csio->ccb_h.status = CAM_DATA_RUN_ERR; break; } /* FALLTHROUGH */ + } case AHASTAT_NOERROR: csio->scsi_status = accb->hccb.sdstat; csio->ccb_h.status |= CAM_SCSI_STATUS_ERROR; @@ -1389,7 +1392,6 @@ ahadone(struct aha_softc *aha, struct aha_ccb *accb, aha_mbi_comp_code_t comp_co csio->ccb_h.status = CAM_REQ_CMP; break; } - csio->resid = aha_a24tou(accb->hccb.data_len); break; case AHASTAT_SELTIMEOUT: csio->ccb_h.status = CAM_SEL_TIMEOUT; |