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

Commit c76a024e authored Jun 26, 2015 by David Dueck Committed by Stephen Boyd Jul 02, 2015

clk: at91: do not leak resources



Do not leak memory and free irqs in case of an error.

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: David Dueck <davidcdueck@googlemail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

parent 15ab3827

drivers/clk/at91/clk-h32mx.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,8 +116,10 @@ void __init of_sama5d4_clk_h32mx_setup(struct device_node *np,
	h32mxclk->pmc = pmc;		h32mxclk->pmc = pmc;

	clk = clk_register(NULL, &h32mxclk->hw);		clk = clk_register(NULL, &h32mxclk->hw);
	if (!clk)		if (!clk) {
			kfree(h32mxclk);
	return;		return;
			}

	of_clk_add_provider(np, of_clk_src_simple_get, clk);		of_clk_add_provider(np, of_clk_src_simple_get, clk);
	}		}

drivers/clk/at91/clk-main.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -171,8 +171,10 @@ at91_clk_register_main_osc(struct at91_pmc *pmc,
	irq_set_status_flags(osc->irq, IRQ_NOAUTOEN);		irq_set_status_flags(osc->irq, IRQ_NOAUTOEN);
	ret = request_irq(osc->irq, clk_main_osc_irq_handler,		ret = request_irq(osc->irq, clk_main_osc_irq_handler,
	IRQF_TRIGGER_HIGH, name, osc);		IRQF_TRIGGER_HIGH, name, osc);
	if (ret)		if (ret) {
			kfree(osc);
	return ERR_PTR(ret);		return ERR_PTR(ret);
			}

	if (bypass)		if (bypass)
	pmc_write(pmc, AT91_CKGR_MOR,		pmc_write(pmc, AT91_CKGR_MOR,

drivers/clk/at91/clk-master.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -165,12 +165,16 @@ at91_clk_register_master(struct at91_pmc *pmc, unsigned int irq,
	irq_set_status_flags(master->irq, IRQ_NOAUTOEN);		irq_set_status_flags(master->irq, IRQ_NOAUTOEN);
	ret = request_irq(master->irq, clk_master_irq_handler,		ret = request_irq(master->irq, clk_master_irq_handler,
	IRQF_TRIGGER_HIGH, "clk-master", master);		IRQF_TRIGGER_HIGH, "clk-master", master);
	if (ret)		if (ret) {
			kfree(master);
	return ERR_PTR(ret);		return ERR_PTR(ret);
			}

	clk = clk_register(NULL, &master->hw);		clk = clk_register(NULL, &master->hw);
	if (IS_ERR(clk))		if (IS_ERR(clk)) {
			free_irq(master->irq, master);
	kfree(master);		kfree(master);
			}

	return clk;		return clk;
	}		}

drivers/clk/at91/clk-pll.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -338,12 +338,16 @@ at91_clk_register_pll(struct at91_pmc pmc, unsigned int irq, const char name,
	irq_set_status_flags(pll->irq, IRQ_NOAUTOEN);		irq_set_status_flags(pll->irq, IRQ_NOAUTOEN);
	ret = request_irq(pll->irq, clk_pll_irq_handler, IRQF_TRIGGER_HIGH,		ret = request_irq(pll->irq, clk_pll_irq_handler, IRQF_TRIGGER_HIGH,
	id ? "clk-pllb" : "clk-plla", pll);		id ? "clk-pllb" : "clk-plla", pll);
	if (ret)		if (ret) {
			kfree(pll);
	return ERR_PTR(ret);		return ERR_PTR(ret);
			}

	clk = clk_register(NULL, &pll->hw);		clk = clk_register(NULL, &pll->hw);
	if (IS_ERR(clk))		if (IS_ERR(clk)) {
			free_irq(pll->irq, pll);
	kfree(pll);		kfree(pll);
			}

	return clk;		return clk;
	}		}

drivers/clk/at91/clk-system.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -130,13 +130,17 @@ at91_clk_register_system(struct at91_pmc pmc, const char name,
	irq_set_status_flags(sys->irq, IRQ_NOAUTOEN);		irq_set_status_flags(sys->irq, IRQ_NOAUTOEN);
	ret = request_irq(sys->irq, clk_system_irq_handler,		ret = request_irq(sys->irq, clk_system_irq_handler,
	IRQF_TRIGGER_HIGH, name, sys);		IRQF_TRIGGER_HIGH, name, sys);
	if (ret)		if (ret) {
			kfree(sys);
	return ERR_PTR(ret);		return ERR_PTR(ret);
	}		}
			}

	clk = clk_register(NULL, &sys->hw);		clk = clk_register(NULL, &sys->hw);
	if (IS_ERR(clk))		if (IS_ERR(clk)) {
			free_irq(sys->irq, sys);
	kfree(sys);		kfree(sys);
			}

	return clk;		return clk;
	}		}