summaryrefslogtreecommitdiff
path: root/sys/dev/pci/mpii.c
diff options
context:
space:
mode:
authorMike Belopuhov <mikeb@cvs.openbsd.org>2017-01-16 18:09:36 +0000
committerMike Belopuhov <mikeb@cvs.openbsd.org>2017-01-16 18:09:36 +0000
commitf864ac90269e51cebba477810aa336687afc03e7 (patch)
treed02651505f46c551eefdb38ef98b14fe5da88b3d /sys/dev/pci/mpii.c
parentfa4261f3e979787d19e7c8d32a32c119a347f6f0 (diff)
Clean up SCSI operation status and state defines
Diffstat (limited to 'sys/dev/pci/mpii.c')
-rw-r--r--sys/dev/pci/mpii.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 6d17d39f40b..94bc8cd3436 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpii.c,v 1.108 2016/11/06 09:58:16 dlg Exp $ */
+/* $OpenBSD: mpii.c,v 1.109 2017/01/16 18:09:35 mikeb Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
* Copyright (c) 2009 James Giannoules
@@ -3063,7 +3063,7 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
DNPRINTF(MPII_D_CMD, "%s: bidirectional_transfer_count: 0x%08x\n",
DEVNAME(sc), letoh32(sie->bidirectional_transfer_count));
- if (sie->scsi_state & MPII_SCSIIO_ERR_STATE_NO_SCSI_STATUS)
+ if (sie->scsi_state & MPII_SCSIIO_STATE_NO_SCSI_STATUS)
xs->status = SCSI_TERMINATED;
else
xs->status = sie->scsi_status;
@@ -3117,7 +3117,7 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
sense = (struct scsi_sense_data *)((caddr_t)ccb->ccb_cmd +
sc->sc_request_size - sizeof(*sense));
- if (sie->scsi_state & MPII_SCSIIO_ERR_STATE_AUTOSENSE_VALID)
+ if (sie->scsi_state & MPII_SCSIIO_STATE_AUTOSENSE_VALID)
memcpy(&xs->sense, sense, sizeof(xs->sense));
DNPRINTF(MPII_D_CMD, "%s: xs err: %d status: %#x\n", DEVNAME(sc),