Commit 027d89d9 authored Dec 21, 2016 by Vladimir Zapolskiy Committed by Guenter Roeck Feb 24, 2017

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: 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>

parent f3519a66

drivers/watchdog/sa1100_wdt.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}