1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 6660fa92ffa1..8a8f803439e1 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -32,6 +32,7 @@
 #include <linux/completion.h>
 #include <linux/transport_class.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
@@ -156,6 +157,7 @@ EXPORT_SYMBOL(scsi_host_set_state);
 void scsi_remove_host(struct Scsi_Host *shost)
 {
         unsigned long flags;
+
         mutex_lock(&shost->scan_mutex);
         spin_lock_irqsave(shost->host_lock, flags);
         if (scsi_host_set_state(shost, SHOST_CANCEL))
@@ -165,6 +167,8 @@ void scsi_remove_host(struct Scsi_Host *shost)
                         return;
                 }
         spin_unlock_irqrestore(shost->host_lock, flags);
+
+        scsi_autopm_get_host(shost);
         scsi_forget_host(shost);
         mutex_unlock(&shost->scan_mutex);
         scsi_proc_host_rm(shost);
@@ -216,12 +220,14 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
                 shost->shost_gendev.parent = dev ? dev : &platform_bus;
         shost->dma_dev = dma_dev;
 
-        device_enable_async_suspend(&shost->shost_gendev);
-
         error = device_add(&shost->shost_gendev);
         if (error)
                 goto out;
 
+        pm_runtime_set_active(&shost->shost_gendev);
+        pm_runtime_enable(&shost->shost_gendev);
+        device_enable_async_suspend(&shost->shost_gendev);
+
         scsi_host_set_state(shost, SHOST_RUNNING);
         get_device(shost->shost_gendev.parent);
 
@@ -325,7 +331,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 {
         struct Scsi_Host *shost;
         gfp_t gfp_mask = GFP_KERNEL;
-        int rval;
 
         if (sht->unchecked_isa_dma && privsize)
                 gfp_mask |= __GFP_DMA;
@@ -420,7 +425,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         shost->ehandler = kthread_run(scsi_error_handler, shost,
                         "scsi_eh_%d", shost->host_no);
         if (IS_ERR(shost->ehandler)) {
-                rval = PTR_ERR(shost->ehandler);
+                printk(KERN_WARNING "scsi%d: error handler thread failed to spawn, error = %ld\n",
+                        shost->host_no, PTR_ERR(shost->ehandler));
                 goto fail_kfree;
         }