git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
clocksource/arm_arch_timer: Fix arch_timer_mem_find_best_frame()
[sfrench/cifs-2.6.git]
/
drivers
/
clocksource
/
arm_arch_timer.c
diff --git
a/drivers/clocksource/arm_arch_timer.c
b/drivers/clocksource/arm_arch_timer.c
index a1fb918b80219239abe04e7d6146b8c54cebb4d0..4bed671e490e0b15d79fd432f3d85dacfd094a96 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