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

PATCH RESEND Superseded Heiner Kallweit 2 participants 2 messages Aug 20, 2015 – Aug 21, 2015 1 message not in the archive

Subsystems (3)

SPI Arm Samsung Exynos Samsung SPI drivers

lore

Share & tools

lore

Heiner Kallweit

author

2015-08-20 20:02 UTC #0 lore raw

PATCH RESEND 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]>

---
Changed:
- Separated fix from added functionality

 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 · 6 lines

2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Krzysztof Kozlowski

Reviewed-by

2015-08-21 00:57 UTC #2 lore raw

Quoted 9 lines · Heiner Kallweit

Fix missing runtime PM cleanup if driver registration fails.
Signed-off-by Heiner Kallweit <[email protected]>
---
Changed:
- Separated fix from added functionality
 drivers/spi/spi-s3c64xx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Looks good, thanks:

Reviewed-by Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

Quoted 16 lines

drivers/spi/spi-s3c64xx.c +1 -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",

drivers/spi/spi-s3c64xx.c static int s3c64xx_spi_probe(struct platform_device *pdev) · line 1205

Quoted 9 lines

drivers/spi/spi-s3c64xx.c +3 -0

@@ -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:

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html