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

Commit Message

Heiner Kallweit Sept. 3, 2015, 8:38 p.m. UTC

Fix missing runtime PM cleanup if driver registration fails.

Signed-off-by: Heiner Kallweit <[e-mail]>
Reviewed-by: Krzysztof Kozlowski <[e-mail]>
---
Changed:
- Separated fix from added functionality
v2:
- Added "Reviewed-by"

 drivers/spi/spi-s3c64xx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Mark Brown Sept. 14, 2015, 5:58 p.m. UTC | #1

On Thu, Sep 03, 2015 at 10:38:46PM +0200, Heiner Kallweit wrote:

> Fix missing runtime PM cleanup if driver registration fails.

Applied all, but please don't put noise like RESEND in the subject lines
especially if it's not actually a resend :(

Patch

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index cd1cfac..8a6ab88 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -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: