aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brown <davidb@codeaurora.org>2011-03-30 11:26:57 -0700
committerDavid Brown <davidb@codeaurora.org>2011-03-31 13:15:40 -0700
commit893b66c39da812e7dd0d7b32aa0633e5d90d950c (patch)
tree26c76f94f1918c67fc2bcbe96dbdd39974d127f4
parent62f0988ee5280ac03f787e3abd70bd91366e3778 (diff)
downloadlinaro-lsk-893b66c39da812e7dd0d7b32aa0633e5d90d950c.tar.gz
msm: timer: fix missing return value
Change af90f10d38 "ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime" missed a return statement, causing a compile warning: arch/arm/mach-msm/timer.c:272: warning: 'return' with no value, in function returning non-void Trivially return 0 for success when running on cpu 0 (to match the comment and previous behavior). Signed-off-by: David Brown <davidb@codeaurora.org>
-rw-r--r--arch/arm/mach-msm/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 56f920c55b6..38b95e949d1 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -269,7 +269,7 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt)
/* Use existing clock_event for cpu 0 */
if (!smp_processor_id())
- return;
+ return 0;
writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);