1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
index 8a74ec30c3d2..d7d521b394c3 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.c
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
@@ -430,24 +430,21 @@ int ufshcd_pltfrm_init(struct platform_device *pdev,
                 goto dealloc_host;
         }
 
-        pm_runtime_set_active(&pdev->dev);
-        pm_runtime_enable(&pdev->dev);
-
         ufshcd_init_lanes_per_dir(hba);
 
         err = ufshcd_init(hba, mmio_base, irq);
         if (err) {
                 dev_err(dev, "Initialization failed\n");
-                goto out_disable_rpm;
+                goto dealloc_host;
         }
 
         platform_set_drvdata(pdev, hba);
 
+        pm_runtime_set_active(&pdev->dev);
+        pm_runtime_enable(&pdev->dev);
+
         return 0;
 
-out_disable_rpm:
-        pm_runtime_disable(&pdev->dev);
-        pm_runtime_set_suspended(&pdev->dev);
 dealloc_host:
         ufshcd_dealloc_host(hba);
 out: