diff options
| author | jhb <jhb@FreeBSD.org> | 2010-12-06 17:02:56 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-12-06 17:02:56 +0000 |
| commit | 6f75fc3cc25018370d65fcd1aa98666c736b3e68 (patch) | |
| tree | 06f532514bb9fbc7ed6e9391deff0f35f6e6674b /sys/dev/mfi | |
| parent | 0a2fe19d79630ac3f3b6b9741e2d6569a6feaa90 (diff) | |
| download | FreeBSD-src-6f75fc3cc25018370d65fcd1aa98666c736b3e68.zip FreeBSD-src-6f75fc3cc25018370d65fcd1aa98666c736b3e68.tar.gz | |
When masking direct and processor devices during an inquiry, properly
preserve the upper bits of the first data byte.
While here, shorten a few nearby lines.
PR: kern/152768
Reported by: Sascha Wildner saw of online.de
Reviewed by: scottl
MFC after: 1 week
Diffstat (limited to 'sys/dev/mfi')
| -rw-r--r-- | sys/dev/mfi/mfi_cam.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c index fe1ffe5..5137c36 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; } |
