* [PATCH 1/4 RESEND] spi: s3c64xx: clean up runtime PM if driver registration fails
@ 2015-08-20 20:02 Heiner Kallweit
[not found] ` <55D6324F.7070601-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2015-08-20 20:02 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA
Fix missing runtime PM cleanup if driver registration fails.
Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
Changed:
- Separated fix from added functionality
drivers/spi/spi-s3c64xx.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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:
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/4 RESEND] spi: s3c64xx: clean up runtime PM if driver registration fails
[not found] ` <55D6324F.7070601-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2015-08-21 0:57 ` Krzysztof Kozlowski
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Kozlowski @ 2015-08-21 0:57 UTC (permalink / raw)
To: Heiner Kallweit
Cc: linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA,
linux-spi-u79uwXL29TY76Z2rM5mHXA
On 21.08.2015 05:02, Heiner Kallweit wrote:
> Fix missing runtime PM cleanup if driver registration fails.
>
> Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> 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 <k.kozlowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
Best regards,
Krzysztof
>
> 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:
>
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-21 0:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-20 20:02 [PATCH 1/4 RESEND] spi: s3c64xx: clean up runtime PM if driver registration fails Heiner Kallweit
[not found] ` <55D6324F.7070601-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-08-21 0:57 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).