|
@@ -459,14 +459,6 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
|
|
if (! scsi_command_normalize_sense(scmd, &sshdr))
|
|
if (! scsi_command_normalize_sense(scmd, &sshdr))
|
|
return FAILED; /* no valid sense data */
|
|
return FAILED; /* no valid sense data */
|
|
|
|
|
|
- if (scmd->cmnd[0] == TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done)
|
|
|
|
- /*
|
|
|
|
- * nasty: for mid-layer issued TURs, we need to return the
|
|
|
|
- * actual sense data without any recovery attempt. For eh
|
|
|
|
- * issued ones, we need to try to recover and interpret
|
|
|
|
- */
|
|
|
|
- return SUCCESS;
|
|
|
|
-
|
|
|
|
scsi_report_sense(sdev, &sshdr);
|
|
scsi_report_sense(sdev, &sshdr);
|
|
|
|
|
|
if (scsi_sense_is_deferred(&sshdr))
|
|
if (scsi_sense_is_deferred(&sshdr))
|
|
@@ -482,6 +474,14 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
|
|
/* handler does not care. Drop down to default handling */
|
|
/* handler does not care. Drop down to default handling */
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (scmd->cmnd[0] == TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done)
|
|
|
|
+ /*
|
|
|
|
+ * nasty: for mid-layer issued TURs, we need to return the
|
|
|
|
+ * actual sense data without any recovery attempt. For eh
|
|
|
|
+ * issued ones, we need to try to recover and interpret
|
|
|
|
+ */
|
|
|
|
+ return SUCCESS;
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Previous logic looked for FILEMARK, EOM or ILI which are
|
|
* Previous logic looked for FILEMARK, EOM or ILI which are
|
|
* mainly associated with tapes and returned SUCCESS.
|
|
* mainly associated with tapes and returned SUCCESS.
|