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

Commit 2d85b5d8 authored by Peter De Schrijver's avatar Peter De Schrijver Committed by Olof Johansson
Browse files

arm/tegra: clk_get should not be fatal 



The timer and rtc-timer clocks aren't gated by default, so there is no reason
to crash the system if the dummy enable call failed.

Signed-off-by: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent d695cfa5

arch/arm/mach-tegra/timer.c

+8 −4
Original line number Diff line number Diff line
@@ -186,7 +186,9 @@ static void __init tegra_init_timer(void) 
	int ret;



	clk = clk_get_sys("timer", NULL);

	BUG_ON(IS_ERR(clk));

	if (IS_ERR(clk))

		pr_warn("Unable to get timer clock\n");

	else

		clk_enable(clk);



	/*
@@ -194,7 +196,9 @@ static void __init tegra_init_timer(void) 
	 * enabled

	 */

	clk = clk_get_sys("rtc-tegra", NULL);

	BUG_ON(IS_ERR(clk));

	if (IS_ERR(clk))

		pr_warn("Unable to get rtc-tegra clock\n");

	else

		clk_enable(clk);



#ifdef CONFIG_HAVE_ARM_TWD