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: Peter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index e2272d263a83bd8bc98970a1d38329fe209db5d2..2f1df471c9328783db0b4f5cede240b64b47d6e5 100644 (file)
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -186,16 +186,20 @@ static void __init tegra_init_timer(void)
        int ret;
 
        clk = clk_get_sys("timer", NULL);
-       BUG_ON(IS_ERR(clk));
-       clk_enable(clk);
+       if (IS_ERR(clk))
+               pr_warn("Unable to get timer clock\n");
+       else
+               clk_enable(clk);
 
        /*
         * rtc registers are used by read_persistent_clock, keep the rtc clock
         * enabled
         */
        clk = clk_get_sys("rtc-tegra", NULL);
-       BUG_ON(IS_ERR(clk));
-       clk_enable(clk);
+       if (IS_ERR(clk))
+               pr_warn("Unable to get rtc-tegra clock\n");
+       else
+               clk_enable(clk);
 
 #ifdef CONFIG_HAVE_ARM_TWD
        twd_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x600);