4 files changed, 7 insertions, 4 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 85e36f3a5585..f4cb7b3e9e23 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1044,10 +1044,6 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
         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);
@@ -1085,6 +1081,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
                 }
         }
 
+        scsi_autopm_put_device(sdev);
         return error;
 }
 
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index aa43496b7b93..0cb5c9f0c743 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2965,6 +2965,7 @@ static int sd_probe(struct device *dev)
         int index;
         int error;
 
+        scsi_autopm_get_device(sdp);
         error = -ENODEV;
         if (sdp->type != TYPE_DISK && sdp->type != TYPE_MOD && sdp->type != TYPE_RBC)
                 goto out;
@@ -3041,6 +3042,7 @@ static int sd_probe(struct device *dev)
  out_free:
         kfree(sdkp);
  out:
+        scsi_autopm_put_device(sdp);
         return error;
 }
 
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 7eeb93627beb..2de44cc58b1a 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -657,6 +657,7 @@ static int sr_probe(struct device *dev)
         struct scsi_cd *cd;
         int minor, error;
 
+        scsi_autopm_get_device(sdev);
         error = -ENODEV;
         if (sdev->type != TYPE_ROM && sdev->type != TYPE_WORM)
                 goto fail;
@@ -744,6 +745,7 @@ fail_put:
 fail_free:
         kfree(cd);
 fail:
+        scsi_autopm_put_device(sdev);
         return error;
 }
 
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index aff9689de0f7..d3fd6e8fb378 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4105,6 +4105,7 @@ static int st_probe(struct device *dev)
                 return -ENODEV;
         }
 
+        scsi_autopm_get_device(SDp);
         i = queue_max_segments(SDp->request_queue);
         if (st_max_sg_segs < i)
                 i = st_max_sg_segs;
@@ -4244,6 +4245,7 @@ out_put_disk:
 out_buffer_free:
         kfree(buffer);
 out:
+        scsi_autopm_put_device(SDp);
         return -ENODEV;
 };