diff options
Diffstat (limited to 'drivers/clocksource/fsl_ftm_timer.c')
| -rw-r--r-- | drivers/clocksource/fsl_ftm_timer.c | 10 | 
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 738515b89073..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,7 +366,11 @@ 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;  } -CLOCKSOURCE_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init); +TIMER_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init);  |