diff options
author | 2016-12-21 03:18:16 +0200 | |
---|---|---|
committer | 2017-02-24 14:00:23 -0800 | |
commit | 027d89d96b6833f37091d858b9dcf92cd9b19aa7 (patch) | |
tree | e808bda336f93d2bf47d99c7f131d891e30783c1 | |
parent | watchdog: update my email address (diff) | |
download | linux-027d89d96b6833f37091d858b9dcf92cd9b19aa7.tar.gz linux-027d89d96b6833f37091d858b9dcf92cd9b19aa7.tar.bz2 linux-027d89d96b6833f37091d858b9dcf92cd9b19aa7.zip |
watchdog: sa11x0/pxa: fix error path of driver initialization
The change corrects release of captured resources on error path, namely
the clock is disabled and put if misc device registration fails and not
enabled clock is not disabled now.
Fixes: 6924089c488e ("watchdog: sa11x0/pxa: get rid of get_clock_tick_rate")
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 8965e3f536c3..d3be4f831db5 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -188,12 +188,14 @@ static int __init sa1100dog_init(void) pre_margin = oscr_freq * margin; ret = misc_register(&sa1100dog_miscdev); - if (ret == 0) + if (ret == 0) { pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n", margin); - return ret; -err: + return 0; + } + clk_disable_unprepare(clk); +err: clk_put(clk); return ret; } |