summaryrefslogtreecommitdiffstats
path: root/sys/dev/aac
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2010-12-06 17:06:21 +0000
committerjhb <jhb@FreeBSD.org>2010-12-06 17:06:21 +0000
commit7305ca595952d5837102e6741fcb92791566434f (patch)
tree70a01bd649b5156d04ca6467fcb0818ec27938cf /sys/dev/aac
parent6f75fc3cc25018370d65fcd1aa98666c736b3e68 (diff)
downloadFreeBSD-src-7305ca595952d5837102e6741fcb92791566434f.zip
FreeBSD-src-7305ca595952d5837102e6741fcb92791566434f.tar.gz
When masking direct and processor devices during an inquiry, properly
preserve the upper bits of the first data byte. Reviewed by: scottl MFC after: 1 week
Diffstat (limited to 'sys/dev/aac')
-rw-r--r--sys/dev/aac/aac_cam.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/aac/aac_cam.c b/sys/dev/aac/aac_cam.c
index 44f4e19..130cd20 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 */
OpenPOWER on IntegriCloud