Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/watchdog/orion_wdt.c

+19 −10
Original line number Diff line number Diff line
@@ -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)