diff options
| author | Frank Rowand <[email protected]> | 2017-06-10 00:26:32 +0000 |
|---|---|---|
| committer | Daniel Lezcano <[email protected]> | 2017-06-12 13:00:23 +0000 |
| commit | 3db1200ca21f3c63c9044185dc5762ef996848cb (patch) | |
| tree | 10abd5bf209dde8eb9342cedd833ea5ab7dadafb /drivers/clocksource/arm_arch_timer.c | |
| parent | alarmtimer: Rate limit periodic intervals (diff) | |
| download | kernel-3db1200ca21f3c63c9044185dc5762ef996848cb.tar.gz kernel-3db1200ca21f3c63c9044185dc5762ef996848cb.zip | |
clocksource/drivers/arm_arch_timer: Fix read and iounmap of incorrect variable
Fix boot warning 'Trying to vfree() nonexistent vm area'
from arch_timer_mem_of_init().
Refactored code attempts to read and iounmap using address frame
instead of address ioremap(frame->cntbase).
Fixes: c389d701dfb70 ("clocksource: arm_arch_timer: split MMIO timer probing.")
Signed-off-by: Frank Rowand <[email protected]>
Reviewed-by: Fu Wei <[email protected]>
Acked-by: Marc Zyngier <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 4bed671e490e..8b5c30062d99 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -1209,9 +1209,9 @@ arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame) return 0; } - rate = readl_relaxed(frame + CNTFRQ); + rate = readl_relaxed(base + CNTFRQ); - iounmap(frame); + iounmap(base); return rate; } |