diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2011-01-26 20:08:53 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2011-01-26 20:08:53 +0000 |
| commit | 97b29d617c0882eb7fd88a453b7c7ce2f793eb81 (patch) | |
| tree | e4d2f7a4340a0c7000f30c8704cc1be4819a8d58 | |
| parent | 0586111600060932988eaa3d94a778793c521b2f (diff) | |
Notes
| -rw-r--r-- | sys/dev/aac/aac_cam.c | 3 | ||||
| -rw-r--r-- | sys/dev/mfi/mfi_cam.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c index cae4c05efca4..4a61b1837699 100644 --- a/sys/dev/aac/aac_cam.c +++ b/sys/dev/aac/aac_cam.c @@ -587,7 +587,8 @@ aac_cam_complete(struct aac_command *cm) (device == T_PROCESSOR) || (sc->flags & AAC_FLAGS_CAM_PASSONLY)) ccb->csio.data_ptr[0] = - ((device & 0xe0) | T_NODEVICE); + ((ccb->csio.data_ptr[0] & 0xe0) | + T_NODEVICE); } else if (ccb->ccb_h.status == CAM_SEL_TIMEOUT && ccb->ccb_h.target_lun != 0) { /* fix for INQUIRYs on Lun>0 */ diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c index fe1ffe5806f9..5137c36bf3cf 100644 --- a/sys/dev/mfi/mfi_cam.c +++ b/sys/dev/mfi/mfi_cam.c @@ -340,14 +340,14 @@ mfip_done(struct mfi_command *cm) ccbh->status = CAM_REQ_CMP; csio->scsi_status = pt->header.scsi_status; if (ccbh->flags & CAM_CDB_POINTER) - command = ccb->csio.cdb_io.cdb_ptr[0]; + command = csio->cdb_io.cdb_ptr[0]; else - command = ccb->csio.cdb_io.cdb_bytes[0]; + command = csio->cdb_io.cdb_bytes[0]; if (command == INQUIRY) { - device = ccb->csio.data_ptr[0] & 0x1f; + device = csio->data_ptr[0] & 0x1f; if ((device == T_DIRECT) || (device == T_PROCESSOR)) csio->data_ptr[0] = - (device & 0xe0) | T_NODEVICE; + (csio->data_ptr[0] & 0xe0) | T_NODEVICE; } break; } |