aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/aac
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2010-12-06 17:06:21 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2010-12-06 17:06:21 +0000
commit6074a716048a7bdbbd1af4eb78964fa42671d31b (patch)
tree70a01bd649b5156d04ca6467fcb0818ec27938cf /sys/dev/aac
parentb596082ba7c8f31f3b95fda4c34500ef9d2009fb (diff)
downloadsrc-6074a716048a7bdbbd1af4eb78964fa42671d31b.tar.gz
src-6074a716048a7bdbbd1af4eb78964fa42671d31b.zip
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
Notes
Notes: svn path=/head/; revision=216236
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 44f4e196caca..130cd20b7f3c 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 */