From: Arvind Yadav Date: Tue, 20 Jun 2017 11:03:30 +0000 (+0530) Subject: clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b70957f656cc070eaaac60b00dca5b40967cb8d6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap In case of error at init time, rollback iomapping. Signed-off-by: Arvind Yadav Signed-off-by: Daniel Lezcano --- diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 3121e2d96c91..3ee7e6fea621 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -329,13 +329,13 @@ static int __init ftm_timer_init(struct device_node *np) priv->clkevt_base = of_iomap(np, 0); if (!priv->clkevt_base) { pr_err("ftm: unable to map event timer registers\n"); - goto err; + goto err_clkevt; } priv->clksrc_base = of_iomap(np, 1); if (!priv->clksrc_base) { pr_err("ftm: unable to map source timer registers\n"); - goto err; + goto err_clksrc; } ret = -EINVAL; @@ -366,6 +366,10 @@ static int __init ftm_timer_init(struct device_node *np) return 0; err: + iounmap(priv->clksrc_base); +err_clksrc: + iounmap(priv->clkevt_base); +err_clkevt: kfree(priv); return ret; }