Skip to contentSkip to conversation

scsi: ufs: ti-j721e-ufs: Fix unwinding of pm_runtime changes

PATCH Applied Vignesh Raghavendra 2 participants 2 messages May 26, 2020 – May 27, 2020 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: ufs: ti-j721e-ufs: Fix unwinding of pm_runtime changes

Fix unwinding of pm_runtime changes when bailing out of driver probe due to a failure and also on removal of driver.

Fixes 6979e56cec97 ("scsi: ufs: Add driver for TI wrapper for Cadence UFS IP")
---
 drivers/scsi/ufs/ti-j721e-ufs.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ti-j721e-ufs.c +10 -3
index 5216d228cdd9..46bb905b4d6a 100644
@@ -32,14 +32,14 @@ static int ti_j721e_ufs_probe(struct platform_device *pdev)
 	ret = pm_runtime_get_sync(dev);
 	if (ret < 0) {
 		pm_runtime_put_noidle(dev);
-		return ret;
+		goto disable_pm;
 	}
 
 	/* Select MPHY refclk frequency */
 	clk = devm_clk_get(dev, NULL);
 	if (IS_ERR(clk)) {
 		dev_err(dev, "Cannot claim MPHY clock.\n");
-		return PTR_ERR(clk);
+		goto clk_err;
 	}
 	clk_rate = clk_get_rate(clk);
 	if (clk_rate == 26000000)
@@ -54,16 +54,23 @@ static int ti_j721e_ufs_probe(struct platform_device *pdev)
 				   dev);
 	if (ret) {
 		dev_err(dev, "failed to populate child nodes %d\n", ret);
-		pm_runtime_put_sync(dev);
+		goto clk_err;
 	}
 
 	return ret;
+
+clk_err:
+	pm_runtime_put_sync(dev);
+disable_pm:
+	pm_runtime_disable(dev);
+	return ret;
 }
 
 static int ti_j721e_ufs_remove(struct platform_device *pdev)
 {
 	of_platform_depopulate(&pdev->dev);
 	pm_runtime_put_sync(&pdev->dev);
+	pm_runtime_disable(&pdev->dev);
 
 	return 0;
 }
Signature · 1 line
2.26.2
#1 lore raw
Quoted 2 lines · Vignesh Raghavendra

Fix unwinding of pm_runtime changes when bailing out of driver probe due to a failure and also on removal of driver.

Applied to 5.8/scsi-queue, thanks!

[1/1] scsi: ufs: ti-j721e-ufs: Fix unwinding of pm_runtime changes

      https://git.kernel.org/mkp/scsi/c/22617e216331
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering