Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull timer fix from Ingo Molnar:
 "A single ARM Juno clocksource driver fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/arm_arch_timer: Fix arch_timer_mem_find_best_frame()

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index a1fb918..4bed671 100644 (file)
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1268,7 +1268,7 @@ arch_timer_mem_find_best_frame(struct arch_timer_mem *timer_mem)
                pr_err("Unable to find a suitable frame in timer @ %pa\n",
                        &timer_mem->cntctlbase);
 
-       return frame;
+       return best_frame;
 }
 
 static int __init