Merge android-4.4-p.198 (dbd0162) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / scsi / scsi_sysfs.c

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index b89af38..1290c54 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1065,7 +1065,8 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
        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);
+       if (!sdev->use_rpm_auto)
+               pm_runtime_forbid(&sdev->sdev_gendev);
        pm_runtime_enable(&sdev->sdev_gendev);
        scsi_autopm_put_target(starget);