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

Commit bfb1f46f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Wim Van Sebroeck
Browse files

watchdog: txx9wdt: Add missing clock (un)prepare calls for CCF 



While the custom minimal TXx9 clock implementation doesn't need or use
clock (un)prepare calls (they are dummies if !CONFIG_HAVE_CLK_PREPARE),
they are mandatory when using the Common Clock Framework.

Hence add them, to prepare for the advent of CCF.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 619db74a

drivers/watchdog/txx9wdt.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) 
		txx9_imclk = NULL;

		txx9_imclk = NULL;

		goto exit;

		goto exit;

	}

	}

	ret = clk_enable(txx9_imclk);

	ret = clk_prepare_enable(txx9_imclk);

	if (ret) {

	if (ret) {

		clk_put(txx9_imclk);

		clk_put(txx9_imclk);

		txx9_imclk = NULL;

		txx9_imclk = NULL;
@@ -144,7 +144,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) 
	return 0;

	return 0;

exit:

exit:

	if (txx9_imclk) {

	if (txx9_imclk) {

		clk_disable(txx9_imclk);

		clk_disable_unprepare(txx9_imclk);

		clk_put(txx9_imclk);

		clk_put(txx9_imclk);

	}

	}

	return ret;

	return ret;
@@ -153,7 +153,7 @@ static int __init txx9wdt_probe(struct platform_device *dev) 
static int __exit txx9wdt_remove(struct platform_device *dev)

static int __exit txx9wdt_remove(struct platform_device *dev)

{

{

	watchdog_unregister_device(&txx9wdt);

	watchdog_unregister_device(&txx9wdt);

	clk_disable(txx9_imclk);

	clk_disable_unprepare(txx9_imclk);

	clk_put(txx9_imclk);

	clk_put(txx9_imclk);

	return 0;

	return 0;

}

}