Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1658599 > unrolled thread
| Started by | Arvind Yadav <arvind.yadav.cs@gmail.com> |
|---|---|
| First post | 2017-06-06 12:40 +0200 |
| Last post | 2017-06-07 23:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] watchdog: davinci: Add missing clk_disable_unprepare(). Arvind Yadav <arvind.yadav.cs@gmail.com> - 2017-06-06 12:40 +0200
Re: [PATCH] watchdog: davinci: Add missing clk_disable_unprepare(). Guenter Roeck <linux@roeck-us.net> - 2017-06-07 23:00 +0200
| From | Arvind Yadav <arvind.yadav.cs@gmail.com> |
|---|---|
| Date | 2017-06-06 12:40 +0200 |
| Subject | [PATCH] watchdog: davinci: Add missing clk_disable_unprepare(). |
| Message-ID | <tPk42-7uB-17@gated-at.bofh.it> |
davinci_wdt_probe() can fail here and we must disable clock.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/watchdog/davinci_wdt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 1ba9ead..2f46487 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -202,8 +202,10 @@ static int davinci_wdt_probe(struct platform_device *pdev)
return PTR_ERR(davinci_wdt->base);
ret = watchdog_register_device(wdd);
- if (ret < 0)
+ if (ret < 0) {
+ clk_disable_unprepare(davinci_wdt->clk);
dev_err(dev, "cannot register watchdog device\n");
+ }
return ret;
}
--
1.9.1
[toc] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2017-06-07 23:00 +0200 |
| Message-ID | <tPQdA-38j-15@gated-at.bofh.it> |
| In reply to | #1658599 |
On Tue, Jun 06, 2017 at 04:08:31PM +0530, Arvind Yadav wrote:
> davinci_wdt_probe() can fail here and we must disable clock.
>
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
... though I would really prefer to have devm_clk_prepare_enable()
instead :-(.
> ---
> drivers/watchdog/davinci_wdt.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index 1ba9ead..2f46487 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -202,8 +202,10 @@ static int davinci_wdt_probe(struct platform_device *pdev)
> return PTR_ERR(davinci_wdt->base);
>
> ret = watchdog_register_device(wdd);
> - if (ret < 0)
> + if (ret < 0) {
> + clk_disable_unprepare(davinci_wdt->clk);
> dev_err(dev, "cannot register watchdog device\n");
> + }
>
> return ret;
> }
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web