Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c39b8b authored by Arvind Yadav's avatar Arvind Yadav Committed by Daniel Lezcano
Browse files

clocksource/drivers/bcm2835_timer: Unmap region obtained by of_iomap 



Free memory mapping, if bcm2835_timer_init is not successful.

Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent f947ee14

drivers/clocksource/bcm2835_timer.c

+10 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int __init bcm2835_timer_init(struct device_node *node) 
	ret = of_property_read_u32(node, "clock-frequency", &freq);

	if (ret) {

		pr_err("Can't read clock-frequency");

		return ret;

		goto err_iounmap;

	}



	system_clock = base + REG_COUNTER_LO;
@@ -108,13 +108,15 @@ static int __init bcm2835_timer_init(struct device_node *node) 
	irq = irq_of_parse_and_map(node, DEFAULT_TIMER);

	if (irq <= 0) {

		pr_err("Can't parse IRQ");

		return -EINVAL;

		ret = -EINVAL;

		goto err_iounmap;

	}



	timer = kzalloc(sizeof(*timer), GFP_KERNEL);

	if (!timer) {

		pr_err("Can't allocate timer struct\n");

		return -ENOMEM;

		ret = -ENOMEM;

		goto err_iounmap;

	}



	timer->control = base + REG_CONTROL;
@@ -133,7 +135,7 @@ static int __init bcm2835_timer_init(struct device_node *node) 
	ret = setup_irq(irq, &timer->act);

	if (ret) {

		pr_err("Can't set up timer IRQ\n");

		return ret;

		goto err_iounmap;

	}



	clockevents_config_and_register(&timer->evt, freq, 0xf, 0xffffffff);
@@ -141,6 +143,10 @@ static int __init bcm2835_timer_init(struct device_node *node) 
	pr_info("bcm2835: system timer (irq = %d)\n", irq);



	return 0;



err_iounmap:

	iounmap(base);

	return ret;

}

CLOCKSOURCE_OF_DECLARE(bcm2835, "brcm,bcm2835-system-timer",

			bcm2835_timer_init);