aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorArvind Yadav <arvind.yadav.cs@gmail.com>2017-06-06 16:08:31 +0530
committerWim Van Sebroeck <wim@iguana.be>2017-07-03 11:02:43 +0200
commit737bcff5faaeea121ccf7c5885507d438c60f06b (patch)
tree0839999c9b5e265c5d777e7ea66b48103195c8ef /drivers/watchdog
parentwatchdog: davinci: Handle return value of clk_prepare_enable (diff)
downloadlinux-dev-737bcff5faaeea121ccf7c5885507d438c60f06b.tar.xz
linux-dev-737bcff5faaeea121ccf7c5885507d438c60f06b.zip
watchdog: davinci: Add missing clk_disable_unprepare().
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> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/davinci_wdt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 1ba9ead7d75a..2f46487af86d 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;
}