|
@@ -151,17 +151,24 @@ static int orion_wdt_probe(struct platform_device *pdev)
|
|
|
clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
if (IS_ERR(clk)) {
|
|
|
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);
|
|
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- if (!res)
|
|
|
- return -ENODEV;
|
|
|
+ if (!res) {
|
|
|
+ ret = -ENODEV;
|
|
|
+ goto disable_clk;
|
|
|
+ }
|
|
|
+
|
|
|
wdt_reg = devm_ioremap(&pdev->dev, res->start, resource_size(res));
|
|
|
- if (!wdt_reg)
|
|
|
- return -ENOMEM;
|
|
|
+ if (!wdt_reg) {
|
|
|
+ ret = -ENOMEM;
|
|
|
+ goto disable_clk;
|
|
|
+ }
|
|
|
|
|
|
wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk;
|
|
|
|
|
@@ -171,14 +178,16 @@ static int orion_wdt_probe(struct platform_device *pdev)
|
|
|
|
|
|
watchdog_set_nowayout(&orion_wdt, nowayout);
|
|
|
ret = watchdog_register_device(&orion_wdt);
|
|
|
- if (ret) {
|
|
|
- clk_disable_unprepare(clk);
|
|
|
- return ret;
|
|
|
- }
|
|
|
+ if (ret)
|
|
|
+ goto disable_clk;
|
|
|
|
|
|
pr_info("Initial timeout %d sec%s\n",
|
|
|
orion_wdt.timeout, nowayout ? ", nowayout" : "");
|
|
|
return 0;
|
|
|
+
|
|
|
+disable_clk:
|
|
|
+ clk_disable_unprepare(clk);
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static int orion_wdt_remove(struct platform_device *pdev)
|