On Wed, Dec 21, 2016 at 03:18:16AM +0200, Vladimir Zapolskiy wrote:
> 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@xxxxxxxxx>
Looks correct to me, thanks.
Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx>
> ---
> drivers/watchdog/sa1100_wdt.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
> index 8965e3f..d3be4f8 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;
> }
> --
> 2.10.2
>
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
