Commit ca140a0d authored by Ankit Agrawal's avatar Ankit Agrawal Committed by Daniel Lezcano
Browse files

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: 6e332163 ("ARM: msm: Add DT support to msm_timer")
Signed-off-by: default avatarAnkit Agrawal <agrawal.ag.ankit@gmail.com>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240713095713.GA430091@bnew-VirtualBox


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 414b2fb4

drivers/clocksource/timer-qcom.c

+6 −1
Original line number Diff line number Diff line
@@ -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);