diff options
| author | Vaibhav Hiremath <hvaibhav@ti.com> | 2012-05-09 21:07:05 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 21:07:05 +0400 |
| commit | 187999119d93f584209400b052cf092141a33650 (patch) | |
| tree | 8c1c90df099ef080a5913ca62b45bf65d97dc0c9 /arch/arm/mach-omap1/timer32k.c | |
| parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
| download | linux-187999119d93f584209400b052cf092141a33650.tar.xz | |
ARM: OMAP1: Add checks for possible error condition in timer_init
On OMAP1, omap_32k_timer_init() function always returns "true",
irrespective of whether error occurred while initializing 32k sync
counter as a kernel clocksource or not and execution will never
fallback to mpu_timer clocksource init code.
This patch adds check for return value from function
omap_init_clocksource_32k(), and fallback to omap_mpu_timer_init()
in case of failure/error from omap_init_clocksource_32k().
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Kevin Hilman <khilman@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/timer32k.c')
| -rw-r--r-- | arch/arm/mach-omap1/timer32k.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 325b9a0aa4a0..e3613a8bcd90 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -182,10 +182,15 @@ static __init void omap_init_32k_timer(void) * Timer initialization * --------------------------------------------------------------------------- */ -bool __init omap_32k_timer_init(void) +int __init omap_32k_timer_init(void) { - omap_init_clocksource_32k(); - omap_init_32k_timer(); + int ret = -ENODEV; - return true; + if (cpu_is_omap16xx()) + ret = omap_init_clocksource_32k(); + + if (!ret) + omap_init_32k_timer(); + + return ret; } |