The unbalanced clk_prepare_enable/clk_disable_unprepare were found
by Linux Driver Verification project (linuxtesting.org). While
going through the report from LDV, the missing check of the return
value from clk_prepare_enable() was found.
Andreas Platschek (2):
rtc: omap: check for clk_prepare_enable() error
rtc: omap: fix unbalanced clk_prepare_enable/clk_disable_unprepare
drivers/rtc/rtc-omap.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
--
2.11.0
There are 2 error paths after clk_prepare_enable() was called, where
clk_disable_unprepare() is missing.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Andreas Platschek <[email protected]>
---
drivers/rtc/rtc-omap.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index ad309feb7d11..c6aa8f94bb3c 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -760,8 +760,10 @@ static int omap_rtc_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
rtc->base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(rtc->base))
+ if (IS_ERR(rtc->base)) {
+ clk_disable_unprepare(rtc->clk);
return PTR_ERR(rtc->base);
+ }
platform_set_drvdata(pdev, rtc);
@@ -894,6 +896,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
return 0;
err:
+ clk_disable_unprepare(rtc->clk);
device_init_wakeup(&pdev->dev, false);
rtc->type->lock(rtc);
pm_runtime_put_sync(&pdev->dev);
--
2.11.0
clk_prepare_enable() returns an error -> check it.
Signed-off-by: Andreas Platschek <[email protected]>
---
drivers/rtc/rtc-omap.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 1d666ac9ef70..ad309feb7d11 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -748,8 +748,15 @@ static int omap_rtc_probe(struct platform_device *pdev)
else
rtc->clk = devm_clk_get(&pdev->dev, "int-clk");
- if (!IS_ERR(rtc->clk))
- clk_prepare_enable(rtc->clk);
+ if (!IS_ERR(rtc->clk)) {
+ ret = clk_prepare_enable(rtc->clk);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "Failed to enable rtc clk (%u)\n", ret);
+ return ret;
+ }
+ }
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
rtc->base = devm_ioremap_resource(&pdev->dev, res);
--
2.11.0
On 06/12/2017 at 20:42:37 +0100, Andreas Platschek wrote:
> clk_prepare_enable() returns an error -> check it.
>
> Signed-off-by: Andreas Platschek <[email protected]>
> ---
> drivers/rtc/rtc-omap.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
> index 1d666ac9ef70..ad309feb7d11 100644
> --- a/drivers/rtc/rtc-omap.c
> +++ b/drivers/rtc/rtc-omap.c
> @@ -748,8 +748,15 @@ static int omap_rtc_probe(struct platform_device *pdev)
> else
> rtc->clk = devm_clk_get(&pdev->dev, "int-clk");
>
> - if (!IS_ERR(rtc->clk))
> - clk_prepare_enable(rtc->clk);
> + if (!IS_ERR(rtc->clk)) {
> + ret = clk_prepare_enable(rtc->clk);
> + if (ret) {
> + dev_err(&pdev->dev,
> + "Failed to enable rtc clk (%u)\n", ret);
As this will never fail, can we avoid having a useless string?
--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
On 06/12/2017 at 20:42:38 +0100, Andreas Platschek wrote:
> There are 2 error paths after clk_prepare_enable() was called, where
> clk_disable_unprepare() is missing.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Signed-off-by: Andreas Platschek <[email protected]>
> ---
> drivers/rtc/rtc-omap.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
Applied, thanks.
--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com