1 files changed, 23 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 1c7d993fa8ad..6a7a60fc0a4e 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -58,6 +58,28 @@ void scsi_eh_wakeup(struct Scsi_Host *shost)
 }
 
 /**
+ * scsi_schedule_eh - schedule EH for SCSI host
+ * @shost:      SCSI host to invoke error handling on.
+ *
+ * Schedule SCSI EH without scmd.
+ **/
+void scsi_schedule_eh(struct Scsi_Host *shost)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(shost->host_lock, flags);
+
+        if (scsi_host_set_state(shost, SHOST_RECOVERY) == 0 ||
+            scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY) == 0) {
+                shost->host_eh_scheduled++;
+                scsi_eh_wakeup(shost);
+        }
+
+        spin_unlock_irqrestore(shost->host_lock, flags);
+}
+EXPORT_SYMBOL_GPL(scsi_schedule_eh);
+
+/**
  * scsi_eh_scmd_add - add scsi cmd to error handling.
  * @scmd:       scmd to run eh on.
  * @eh_flag:    optional SCSI_EH flag.
@@ -1515,7 +1537,7 @@ int scsi_error_handler(void *data)
          */
         set_current_state(TASK_INTERRUPTIBLE);
         while (!kthread_should_stop()) {
-                if (shost->host_failed == 0 ||
+                if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) ||
                     shost->host_failed != shost->host_busy) {
                         SCSI_LOG_ERROR_RECOVERY(1,
                                 printk("Error handler scsi_eh_%d sleeping\n",