1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 771c16bfdbac..d020149ea8d4 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1157,6 +1157,15 @@ int scsi_eh_get_sense(struct list_head *work_q,
                                              __func__));
                         break;
                 }
+                if (status_byte(scmd->result) != CHECK_CONDITION)
+                        /*
+                         * don't request sense if there's no check condition
+                         * status because the error we're processing isn't one
+                         * that has a sense code (and some devices get
+                         * confused by sense requests out of the blue)
+                         */
+                        continue;
+
                 SCSI_LOG_ERROR_RECOVERY(2, scmd_printk(KERN_INFO, scmd,
                                                   "%s: requesting sense\n",
                                                   current->comm));