diff options
| author | mjacob <mjacob@FreeBSD.org> | 2000-07-14 19:41:43 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2000-07-14 19:41:43 +0000 |
| commit | 5da45542d2fe7225c67ea8d521d130091ef15278 (patch) | |
| tree | 1eb66d027994fb2683e491a52a14619f2ad7f45e | |
| parent | 1ee69f5fc1a1d47e451a6491901cdb1f42ac413a (diff) | |
| download | FreeBSD-src-5da45542d2fe7225c67ea8d521d130091ef15278.zip FreeBSD-src-5da45542d2fe7225c67ea8d521d130091ef15278.tar.gz | |
Properly initialize softc. Do some minor SCSI_CDB6_LEN changes.
Obtained from:gibbs@freebsd.org
| -rw-r--r-- | sys/cam/scsi/scsi_targ_bh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c index ba80ac1..011cfce 100644 --- a/sys/cam/scsi/scsi_targ_bh.c +++ b/sys/cam/scsi/scsi_targ_bh.c @@ -420,7 +420,7 @@ targbhctor(struct cam_periph *periph, void *arg) return (CAM_REQ_CMP_ERR); } - bzero(softc, sizeof(softc)); + bzero(softc, sizeof(*softc)); TAILQ_INIT(&softc->pending_queue); TAILQ_INIT(&softc->work_queue); softc->accept_tio_list = NULL; @@ -593,7 +593,7 @@ targbhdone(struct cam_periph *periph, union ccb *done_ccb) * no_lun_sense_data response. */ atio->sense_data = no_lun_sense_data; - atio->sense_len = sizeof (no_lun_sense_data); + atio->sense_len = sizeof(no_lun_sense_data); descr->data_resid = 0; descr->data_increment = 0; descr->status = SCSI_STATUS_CHECK_COND; @@ -607,7 +607,7 @@ targbhdone(struct cam_periph *periph, union ccb *done_ccb) atio->ccb_h.flags |= CAM_DIR_IN; descr->data = &no_lun_inq_data; descr->data_resid = MIN(sizeof(no_lun_inq_data), - inq->length); + SCSI_CDB6_LEN(inq->length)); descr->data_increment = descr->data_resid; descr->timeout = 5 * 1000; descr->status = SCSI_STATUS_OK; @@ -624,7 +624,7 @@ targbhdone(struct cam_periph *periph, union ccb *done_ccb) descr->data = &no_lun_sense_data; descr->data_resid = request_sense_size; descr->data_resid = MIN(descr->data_resid, - rsense->length); + SCSI_CDB6_LEN(rsense->length)); descr->data_increment = descr->data_resid; descr->timeout = 5 * 1000; descr->status = SCSI_STATUS_OK; |
