mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] watchdog: davinci: Add missing clk_disable_unprepare().
@ 2017-06-06 10:38 Arvind Yadav
  2017-06-07 20:51 ` Guenter Roeck
  0 siblings, 1 reply; 2+ messages in thread
From: Arvind Yadav @ 2017-06-06 10:38 UTC (permalink / raw)
  To: wim, linux; +Cc: linux-watchdog, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] watchdog: davinci: Add missing clk_disable_unprepare().
  2017-06-06 10:38 [PATCH] watchdog: davinci: Add missing clk_disable_unprepare() Arvind Yadav
@ 2017-06-07 20:51 ` Guenter Roeck
  0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2017-06-07 20:51 UTC (permalink / raw)
  To: Arvind Yadav; +Cc: wim, linux-watchdog, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-06-07 20:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-06 10:38 [PATCH] watchdog: davinci: Add missing clk_disable_unprepare() Arvind Yadav
2017-06-07 20:51 ` Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®