diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 01306c018398fa16583cab46bd1e51b9ccf86309..e4a781d9b58f5180c0a49584a46dbff87ad9a3da 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -974,7 +974,7 @@ void ata_std_end_eh(struct ata_port *ap)
 {
 	struct Scsi_Host *host = ap->scsi_host;
 
-	host->host_eh_scheduled = 0;
+	atomic_dec(&host->host_eh_scheduled);
 }
 EXPORT_SYMBOL(ata_std_end_eh);
 
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 33229348dcb6adc88fe11de596708776a4ee04e2..b2e0d0f21e73c3ca4a390bf524d5ee8a8fcaf7a6 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -492,7 +492,7 @@ int sas_eh_abort_handler(struct scsi_cmnd *cmd)
 
 	spin_lock_irqsave(host->host_lock, flags);
 	/* We cannot do async aborts for SATA devices */
-	if (dev_is_sata(dev) && !host->host_eh_scheduled) {
+	if (dev_is_sata(dev) && !atomic_read(&host->host_eh_scheduled)) {
 		spin_unlock_irqrestore(host->host_lock, flags);
 		return FAILED;
 	}
@@ -792,7 +792,7 @@ void sas_scsi_recover_host(struct Scsi_Host *shost)
 	/* check if any new eh work was scheduled during the last run */
 	spin_lock_irq(&ha->lock);
 	if (ha->eh_active == 0) {
-		shost->host_eh_scheduled = 0;
+		atomic_set(&shost->host_eh_scheduled, 0);
 		retry = false;
 	}
 	spin_unlock_irq(&ha->lock);
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index c736d61b1648fc9816e1601be1c223ec8ddbec81..55f12ecaf400897fe5823f71180b3348013fcd9d 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -88,7 +88,7 @@ void scsi_schedule_eh(struct Scsi_Host *shost)
 
 	if (scsi_host_set_state(shost, SHOST_RECOVERY) == 0 ||
 	    scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY) == 0) {
-		shost->host_eh_scheduled++;
+		atomic_inc(&shost->host_eh_scheduled);
 		scsi_eh_wakeup(shost);
 	}
 
@@ -2029,7 +2029,7 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
 	 * pending commands complete.
 	 */
 	spin_lock_irqsave(shost->host_lock, flags);
-	if (shost->host_eh_scheduled)
+	if (atomic_read(&shost->host_eh_scheduled))
 		if (scsi_host_set_state(shost, SHOST_RECOVERY))
 			WARN_ON(scsi_host_set_state(shost, SHOST_CANCEL_RECOVERY));
 	spin_unlock_irqrestore(shost->host_lock, flags);
@@ -2165,7 +2165,8 @@ int scsi_error_handler(void *data)
 		if (kthread_should_stop())
 			break;
 
-		if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) ||
+		if ((shost->host_failed == 0 &&
+		     atomic_read(&shost->host_eh_scheduled) == 0) ||
 		    shost->host_failed != scsi_host_busy(shost)) {
 			SCSI_LOG_ERROR_RECOVERY(1,
 				shost_printk(KERN_INFO, shost,
@@ -2179,7 +2180,8 @@ int scsi_error_handler(void *data)
 		SCSI_LOG_ERROR_RECOVERY(1,
 			shost_printk(KERN_INFO, shost,
 				     "scsi_eh_%d: waking up %d/%d/%d\n",
-				     shost->host_no, shost->host_eh_scheduled,
+				     shost->host_no,
+				     atomic_read(&shost->host_eh_scheduled),
 				     shost->host_failed,
 				     scsi_host_busy(shost)));
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 292829da23bd921f76880191fa7cc8765d02147b..300e5d6ec67eee0541e717bbbe6cd2cd13b96674 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -348,7 +348,8 @@ static void scsi_dec_host_busy(struct Scsi_Host *shost)
 	atomic_dec(&shost->host_busy);
 	if (unlikely(scsi_host_in_recovery(shost))) {
 		spin_lock_irqsave(shost->host_lock, flags);
-		if (shost->host_failed || shost->host_eh_scheduled)
+		if (shost->host_failed ||
+		    atomic_read(&shost->host_eh_scheduled))
 			scsi_eh_wakeup(shost);
 		spin_unlock_irqrestore(shost->host_lock, flags);
 	}
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 5ea06d310a256b99f49049461311c63d89ee7471..7c241cbf64a03989fb50b99a0d0474a3ae161fda 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -561,7 +561,7 @@ struct Scsi_Host {
 
 	unsigned int host_failed;	   /* commands that failed.
 					      protected by host_lock */
-	unsigned int host_eh_scheduled;    /* EH scheduled without command */
+	atomic_t host_eh_scheduled;    /* EH scheduled without command */
     
 	unsigned int host_no;  /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */