Commit 027d89d9 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Guenter Roeck

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: 6924089c ("watchdog: sa11x0/pxa: get rid of get_clock_tick_rate")
Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent f3519a66
...@@ -188,12 +188,14 @@ static int __init sa1100dog_init(void) ...@@ -188,12 +188,14 @@ static int __init sa1100dog_init(void)
pre_margin = oscr_freq * margin; pre_margin = oscr_freq * margin;
ret = misc_register(&sa1100dog_miscdev); ret = misc_register(&sa1100dog_miscdev);
if (ret == 0) if (ret == 0) {
pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n", pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",
margin); margin);
return ret; return 0;
err: }
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
err:
clk_put(clk); clk_put(clk);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment