diff options
| author | njl <njl@FreeBSD.org> | 2002-08-28 07:00:58 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2002-08-28 07:00:58 +0000 |
| commit | 5c2731b639815ed93225d86026d000b2250d778f (patch) | |
| tree | 92c6a0d5e7873d69dbfeedc7fcf87210457d0185 | |
| parent | 6792f38305994997fa8be20e475c792f02458682 (diff) | |
| download | FreeBSD-src-5c2731b639815ed93225d86026d000b2250d778f.zip FreeBSD-src-5c2731b639815ed93225d86026d000b2250d778f.tar.gz | |
Use csio pointer instead of dereferencing hcb.
MFC after: 1 week
| -rw-r--r-- | sys/dev/ata/atapi-cam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c index f65eb78..e55b0aec 100644 --- a/sys/dev/ata/atapi-cam.c +++ b/sys/dev/ata/atapi-cam.c @@ -518,19 +518,19 @@ atapi_cb(struct atapi_request *req) req->sense.asc, req->sense.ascq); #endif if (hcb_status != 0) { - hcb->ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; - if ((hcb->ccb->ccb_h.flags & CAM_DIS_AUTOSENSE) == 0) { - hcb->ccb->ccb_h.status |= CAM_AUTOSNS_VALID; + csio->scsi_status = SCSI_STATUS_CHECK_COND; + if ((csio->ccb_h.flags & CAM_DIS_AUTOSENSE) == 0) { + csio->ccb_h.status |= CAM_AUTOSNS_VALID; bcopy((void *)&req->sense, (void *)&csio->sense_data, sizeof(struct atapi_reqsense)); } free_hcb_and_ccb_done(hcb, CAM_SCSI_STATUS_ERROR); } else { - if (((hcb->ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) && + if (((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) && hcb->dxfer_alloc != NULL) bcopy(hcb->dxfer_alloc, csio->data_ptr, csio->dxfer_len); - hcb->ccb->csio.scsi_status = SCSI_STATUS_OK; + csio->scsi_status = SCSI_STATUS_OK; free_hcb_and_ccb_done(hcb, CAM_REQ_CMP); } splx(s); |
