diff options
| author | kan <kan@FreeBSD.org> | 2013-01-19 03:19:39 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2013-01-19 03:19:39 +0000 |
| commit | 404c93b66124e228cff11515450b5db58fa7fe0c (patch) | |
| tree | e970e050939adc2f9dabd22c7a4a9404d735d015 /sys/dev/usb | |
| parent | c3e3cd888a40bf5ef4db38bead1b0b215e6483b6 (diff) | |
| download | FreeBSD-src-404c93b66124e228cff11515450b5db58fa7fe0c.zip FreeBSD-src-404c93b66124e228cff11515450b5db58fa7fe0c.tar.gz | |
Do not pretend to have autosense data when no such data is available.
Make umass return an error code if SCSI sense retrieval request
has failed. Make sure scsi_error_action honors SF_NO_RETRY and
SF_NO_RECOVERY in all cases, even if it cannot parse sense bytes.
Reviewed by: hselasky (umass), scottl (cam)
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/storage/umass.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 0785940..a7feea7 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2602,9 +2602,13 @@ umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, } } else { xpt_freeze_devq(ccb->ccb_h.path, 1); - ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR - | CAM_AUTOSNS_VALID | CAM_DEV_QFRZN; - ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; + if (key >= 0) { + ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR + | CAM_AUTOSNS_VALID | CAM_DEV_QFRZN; + ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; + } else + ccb->ccb_h.status = CAM_AUTOSENSE_FAIL + | CAM_DEV_QFRZN; } xpt_done(ccb); break; |
