1 files changed, 18 insertions, 2 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 5f85f8e831f3..562fb3bce261 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/device.h>
+#include <linux/pm_runtime.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
@@ -802,8 +803,6 @@ static int scsi_target_add(struct scsi_target *starget)
         if (starget->state != STARGET_CREATED)
                 return 0;
 
-        device_enable_async_suspend(&starget->dev);
-
         error = device_add(&starget->dev);
         if (error) {
                 dev_err(&starget->dev, "target device_add failed, error %d\n", error);
@@ -812,6 +811,10 @@ static int scsi_target_add(struct scsi_target *starget)
         transport_add_device(&starget->dev);
         starget->state = STARGET_RUNNING;
 
+        pm_runtime_set_active(&starget->dev);
+        pm_runtime_enable(&starget->dev);
+        device_enable_async_suspend(&starget->dev);
+
         return 0;
 }
 
@@ -841,7 +844,20 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
                 return error;
 
         transport_configure_device(&starget->dev);
+
         device_enable_async_suspend(&sdev->sdev_gendev);
+        scsi_autopm_get_target(starget);
+        pm_runtime_set_active(&sdev->sdev_gendev);
+        pm_runtime_forbid(&sdev->sdev_gendev);
+        pm_runtime_enable(&sdev->sdev_gendev);
+        scsi_autopm_put_target(starget);
+
+        /* The following call will keep sdev active indefinitely, until
+         * its driver does a corresponding scsi_autopm_pm_device().  Only
+         * drivers supporting autosuspend will do this.
+         */
+        scsi_autopm_get_device(sdev);
+
         error = device_add(&sdev->sdev_gendev);
         if (error) {
                 printk(KERN_INFO "error 1\n");