diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-12 10:43:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-12 10:43:25 -0700 |
| commit | dfcb7b2379ff90afb9231da040046f4b9eb1c895 (patch) | |
| tree | ebf1f5e1e08f94b3a5721a3b80483124e494e8c1 /drivers | |
| parent | 1b84fc1503f24862d45eafb2e63da72b714da3fa (diff) | |
| parent | f63d947c1673930bfc5f2f9bd1073a02c179a890 (diff) | |
| download | linux-dfcb7b2379ff90afb9231da040046f4b9eb1c895.tar.bz2 | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a1fb918b8021..4bed671e490e 100644 --- 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 |