diff options
| author | Peter De Schrijver | 2011-10-26 10:41:41 +0200 |
|---|---|---|
| committer | Olof Johansson | 2011-12-18 05:06:18 +0100 |
| commit | 2d85b5d8e1f45bc19ba28d6bce2eaae2ca32f9ac (patch) | |
| tree | ec1e4820d5229c12486a1aab0d058cc765ed84ce /arch/arm/mach-tegra/timer.c | |
| parent | Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc (diff) | |
| download | kernel-qcow2-linux-2d85b5d8e1f45bc19ba28d6bce2eaae2ca32f9ac.tar.gz kernel-qcow2-linux-2d85b5d8e1f45bc19ba28d6bce2eaae2ca32f9ac.tar.xz kernel-qcow2-linux-2d85b5d8e1f45bc19ba28d6bce2eaae2ca32f9ac.zip | |
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>
Diffstat (limited to 'arch/arm/mach-tegra/timer.c')
| -rw-r--r-- | arch/arm/mach-tegra/timer.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c index e2272d263a83..2f1df471c932 100644 --- 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); |