diff options
| author | dim <dim@FreeBSD.org> | 2010-12-09 22:01:15 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-12-09 22:01:15 +0000 |
| commit | a3786f65f1e2fa3a4e925fdb4b2b5544b9021bf9 (patch) | |
| tree | 5f0a24f71baa3176c75a20a51a9e20a22c75426c /sys/dev/aac/aac_cam.c | |
| parent | ad01c620333d05c430d583ee40647e396be1ab91 (diff) | |
| parent | 12dd9eb8e940c48f9fc30dbc137071b4fe5caead (diff) | |
| download | FreeBSD-src-a3786f65f1e2fa3a4e925fdb4b2b5544b9021bf9.zip FreeBSD-src-a3786f65f1e2fa3a4e925fdb4b2b5544b9021bf9.tar.gz | |
Sync: merge r216133 through r216338 from ^/head.
Diffstat (limited to 'sys/dev/aac/aac_cam.c')
| -rw-r--r-- | sys/dev/aac/aac_cam.c | 3 |
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 */ |
