diff options
| author | Ankit Agrawal <agrawal.ag.ankit@gmail.com> | 2024-07-13 15:27:13 +0530 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2024-09-06 14:49:21 +0200 |
| commit | ca140a0dc0a18acd4653b56db211fec9b2339986 (patch) | |
| tree | 603acdbf32f4cc47a8c0d27270bfda809e94ad9f /drivers/clocksource | |
| parent | 414b2fb4bb5aa09f39262c24ed90b831d18ff984 (diff) | |
| download | linux-ca140a0dc0a18acd4653b56db211fec9b2339986.tar.gz linux-ca140a0dc0a18acd4653b56db211fec9b2339986.tar.bz2 linux-ca140a0dc0a18acd4653b56db211fec9b2339986.zip | |
clocksource/drivers/qcom: Add missing iounmap() on errors in msm_dt_timer_init()
Add the missing iounmap() when clock frequency fails to get read by the
of_property_read_u32() call, or if the call to msm_timer_init() fails.
Fixes: 6e3321631ac2 ("ARM: msm: Add DT support to msm_timer")
Signed-off-by: Ankit Agrawal <agrawal.ag.ankit@gmail.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240713095713.GA430091@bnew-VirtualBox
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/timer-qcom.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-qcom.c b/drivers/clocksource/timer-qcom.c index b4afe3a67583..eac4c95c6127 100644 --- a/drivers/clocksource/timer-qcom.c +++ b/drivers/clocksource/timer-qcom.c @@ -233,6 +233,7 @@ static int __init msm_dt_timer_init(struct device_node *np) } if (of_property_read_u32(np, "clock-frequency", &freq)) { + iounmap(cpu0_base); pr_err("Unknown frequency\n"); return -EINVAL; } @@ -243,7 +244,11 @@ static int __init msm_dt_timer_init(struct device_node *np) freq /= 4; writel_relaxed(DGT_CLK_CTL_DIV_4, source_base + DGT_CLK_CTL); - return msm_timer_init(freq, 32, irq, !!percpu_offset); + ret = msm_timer_init(freq, 32, irq, !!percpu_offset); + if (ret) + iounmap(cpu0_base); + + return ret; } TIMER_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); TIMER_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); |