Commit bb02c662 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper

watchdog: orion: Add clock error handling

This commit adds a check for clk_prepare_enable success and introduces
an error path to disable the clock properly.
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Tested-By: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent d86e9af6
...@@ -151,17 +151,24 @@ static int orion_wdt_probe(struct platform_device *pdev) ...@@ -151,17 +151,24 @@ static int orion_wdt_probe(struct platform_device *pdev)
clk = devm_clk_get(&pdev->dev, NULL); clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "Orion Watchdog missing clock\n"); dev_err(&pdev->dev, "Orion Watchdog missing clock\n");
return -ENODEV; return PTR_ERR(clk);
} }
clk_prepare_enable(clk); ret = clk_prepare_enable(clk);
if (ret)
return ret;
wdt_tclk = clk_get_rate(clk); wdt_tclk = clk_get_rate(clk);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) if (!res) {
return -ENODEV; ret = -ENODEV;
goto disable_clk;
}
wdt_reg = devm_ioremap(&pdev->dev, res->start, resource_size(res)); wdt_reg = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (!wdt_reg) if (!wdt_reg) {
return -ENOMEM; ret = -ENOMEM;
goto disable_clk;
}
wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk; wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk;
...@@ -171,14 +178,16 @@ static int orion_wdt_probe(struct platform_device *pdev) ...@@ -171,14 +178,16 @@ static int orion_wdt_probe(struct platform_device *pdev)
watchdog_set_nowayout(&orion_wdt, nowayout); watchdog_set_nowayout(&orion_wdt, nowayout);
ret = watchdog_register_device(&orion_wdt); ret = watchdog_register_device(&orion_wdt);
if (ret) { if (ret)
clk_disable_unprepare(clk); goto disable_clk;
return ret;
}
pr_info("Initial timeout %d sec%s\n", pr_info("Initial timeout %d sec%s\n",
orion_wdt.timeout, nowayout ? ", nowayout" : ""); orion_wdt.timeout, nowayout ? ", nowayout" : "");
return 0; return 0;
disable_clk:
clk_disable_unprepare(clk);
return ret;
} }
static int orion_wdt_remove(struct platform_device *pdev) static int orion_wdt_remove(struct platform_device *pdev)
......
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