Skip to contentSkip to conversation

spi: s3c64xx: clean up runtime PM if driver registration fails

PATCH RESEND In review Heiner Kallweit 1 participant 1 message Aug 21, 2015

Subsystems (3)
SPI Arm Samsung Exynos Samsung SPI drivers
lore
Share & tools
lore

Heiner Kallweit

author
#0 lore raw

PATCH RESEND v2 1/4 spi: s3c64xx: clean up runtime PM if driver registration fails

Fix missing runtime PM cleanup if driver registration fails.

Signed-off-by Heiner Kallweit <[email protected]>
Reviewed-by Krzysztof Kozlowski <[email protected]>

---
Changed:
- Separated fix from added functionality
v2:
- Added "Reviewed-by"

 drivers/spi/spi-s3c64xx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/spi/spi-s3c64xx.c +4 -1
index cd1cfac..8a6ab88 100644
@@ -1186,7 +1186,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	ret = devm_spi_register_master(&pdev->dev, master);
 	if (ret != 0) {
 		dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
-		goto err3;
+		goto err4;
 	}
 
 	dev_dbg(&pdev->dev, "Samsung SoC SPI Driver loaded for Bus SPI-%d with %d Slaves attached\n",

@@ -1197,6 +1197,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 
 	return 0;
 
+err4:
+	pm_runtime_disable(&pdev->dev);
+	pm_runtime_set_suspended(&pdev->dev);
 err3:
 	clk_disable_unprepare(sdd->src_clk);
 err2:
Signature · 1 line
2.5.0