* [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable
@ 2017-05-30 10:52 Arvind Yadav
2017-05-30 16:48 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Arvind Yadav @ 2017-05-30 10:52 UTC (permalink / raw)
To: linux-arm-kernel
clk_prepare_enable() can fail here and we must check its return value.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/input/touchscreen/s3c2410_ts.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 41d58e8..3b3db8c 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -264,7 +264,11 @@ static int s3c2410ts_probe(struct platform_device *pdev)
return -ENOENT;
}
- clk_prepare_enable(ts.clock);
+ ret = clk_prepare_enable(ts.clock);
+ if (ret) {
+ dev_err(dev, "Failed! to enabled clocks\n");
+ goto err_clk_get;
+ }
dev_dbg(dev, "got and enabled clocks\n");
ts.irq_tc = ret = platform_get_irq(pdev, 0);
@@ -353,7 +357,9 @@ static int s3c2410ts_probe(struct platform_device *pdev)
err_iomap:
iounmap(ts.io);
err_clk:
+ clk_disable_unprepare(ts.clock);
del_timer_sync(&touch_timer);
+ err_clk_get:
clk_put(ts.clock);
return ret;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable
2017-05-30 10:52 [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable Arvind Yadav
@ 2017-05-30 16:48 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2017-05-30 16:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 30, 2017 at 04:22:57PM +0530, Arvind Yadav wrote:
> clk_prepare_enable() can fail here and we must check its return value.
>
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Applied, thank you.
> ---
> drivers/input/touchscreen/s3c2410_ts.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
> index 41d58e8..3b3db8c 100644
> --- a/drivers/input/touchscreen/s3c2410_ts.c
> +++ b/drivers/input/touchscreen/s3c2410_ts.c
> @@ -264,7 +264,11 @@ static int s3c2410ts_probe(struct platform_device *pdev)
> return -ENOENT;
> }
>
> - clk_prepare_enable(ts.clock);
> + ret = clk_prepare_enable(ts.clock);
> + if (ret) {
> + dev_err(dev, "Failed! to enabled clocks\n");
> + goto err_clk_get;
> + }
> dev_dbg(dev, "got and enabled clocks\n");
>
> ts.irq_tc = ret = platform_get_irq(pdev, 0);
> @@ -353,7 +357,9 @@ static int s3c2410ts_probe(struct platform_device *pdev)
> err_iomap:
> iounmap(ts.io);
> err_clk:
> + clk_disable_unprepare(ts.clock);
> del_timer_sync(&touch_timer);
> + err_clk_get:
> clk_put(ts.clock);
> return ret;
> }
> --
> 1.9.1
>
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-30 16:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-30 10:52 [PATCH] Input: s3c2410_ts - Handle return value of clk_prepare_enable Arvind Yadav
2017-05-30 16:48 ` Dmitry Torokhov
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).