Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b266bcd6 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "scsi: ufs: Avoid runtime suspend possibly being blocked forever" 



This reverts commit 73e3c601.

This is a preparation change for merging android-4.14 commit
fe57a37b into msm-4.14 branch.
The reverted delta is committed already via:

a70ea9c3 scsi: ufs: enable runtime pm only after ufshcd init

Change-Id: I9695c13796ef3804886d3802d6f04e9f3e242e4a
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent fe57a37b

drivers/scsi/ufs/ufshcd-pltfrm.c

+7 −4
Original line number Diff line number Diff line
@@ -340,21 +340,24 @@ 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 dealloc_host;

		goto out_disable_rpm;

	}



	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: