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

Commit 2743f1be authored by Gael Portay's avatar Gael Portay Committed by Daniel Lezcano
Browse files

clocksource: tcb_clksrc: Sanitize IRQ request 



The clock is not unprepared in case of the request IRQ fails.

Also update to request_irq.

Signed-off-by: default avatarGaël PORTAY <gael.portay@gmail.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent c387f07e

drivers/clocksource/tcb_clksrc.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle) 
	return IRQ_NONE;

	return IRQ_NONE;

}

}





static struct irqaction tc_irqaction = {

	.name		= "tc_clkevt",

	.flags		= IRQF_TIMER,

	.handler	= ch2_irq,

};



static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)

static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)

{

{

	int ret;

	int ret;
@@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) 




	clkevt.regs = tc->regs;

	clkevt.regs = tc->regs;

	clkevt.clk = t2_clk;

	clkevt.clk = t2_clk;

	tc_irqaction.dev_id = &clkevt;





	timer_clock = clk32k_divisor_idx;

	timer_clock = clk32k_divisor_idx;





	clkevt.clkevt.cpumask = cpumask_of(0);

	clkevt.clkevt.cpumask = cpumask_of(0);





	ret = setup_irq(irq, &tc_irqaction);

	ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt);

	if (ret)

	if (ret) {

		clk_disable_unprepare(t2_clk);

		return ret;

		return ret;

	}





	clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);

	clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);