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

Commit 090bcfd5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'clockevents/4.19-fixes' of... 

Merge branch 'clockevents/4.19-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull another fix from Daniel Lezcano, which felt through the cracks:

 - Fix a potential memory leak reported by smatch in the atmel timer driver
parents 864f893f 52bf4a90

drivers/clocksource/timer-atmel-pit.c

+14 −6
Original line number Diff line number Diff line
@@ -180,26 +180,29 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) 
	data->base = of_iomap(node, 0);

	if (!data->base) {

		pr_err("Could not map PIT address\n");

		return -ENXIO;

		ret = -ENXIO;

		goto exit;

	}



	data->mck = of_clk_get(node, 0);

	if (IS_ERR(data->mck)) {

		pr_err("Unable to get mck clk\n");

		return PTR_ERR(data->mck);

		ret = PTR_ERR(data->mck);

		goto exit;

	}



	ret = clk_prepare_enable(data->mck);

	if (ret) {

		pr_err("Unable to enable mck\n");

		return ret;

		goto exit;

	}



	/* Get the interrupts property */

	data->irq = irq_of_parse_and_map(node, 0);

	if (!data->irq) {

		pr_err("Unable to get IRQ from DT\n");

		return -EINVAL;

		ret = -EINVAL;

		goto exit;

	}



	/*
@@ -227,7 +230,7 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) 
	ret = clocksource_register_hz(&data->clksrc, pit_rate);

	if (ret) {

		pr_err("Failed to register clocksource\n");

		return ret;

		goto exit;

	}



	/* Set up irq handler */
@@ -236,7 +239,8 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) 
			  "at91_tick", data);

	if (ret) {

		pr_err("Unable to setup IRQ\n");

		return ret;

		clocksource_unregister(&data->clksrc);

		goto exit;

	}



	/* Set up and register clockevents */
@@ -254,6 +258,10 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) 
	clockevents_register_device(&data->clkevt);



	return 0;



exit:

	kfree(data);

	return ret;

}

TIMER_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",

		       at91sam926x_pit_dt_init);