linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] clk: bcm2835: add missing release if devm_clk_hw_register fails
@ 2020-08-09 23:11 Navid Emamdoost
  2020-10-14  3:01 ` Stephen Boyd
  0 siblings, 1 reply; 2+ messages in thread
From: Navid Emamdoost @ 2020-08-09 23:11 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Nicolas Saenz Julienne,
	Florian Fainelli, Ray Jui, Scott Branden,
	bcm-kernel-feedback-list, Eric Anholt, Stefan Wahren,
	Matthias Brugger, Nathan Chancellor, Navid Emamdoost,
	Rikard Falkeborn, YueHaibing, linux-clk, linux-rpi-kernel,
	linux-arm-kernel, linux-kernel
  Cc: emamd001

In the implementation of bcm2835_register_pll(), the allocated pll is
leaked if devm_clk_hw_register() fails to register hw. Release pll if
devm_clk_hw_register() fails.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
 drivers/clk/bcm/clk-bcm2835.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 6bb7efa12037..12b950d50252 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -1321,8 +1321,10 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
 	pll->hw.init = &init;
 
 	ret = devm_clk_hw_register(cprman->dev, &pll->hw);
-	if (ret)
+	if (ret) {
+		kfree(pll);
 		return NULL;
+	}
 	return &pll->hw;
 }
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] clk: bcm2835: add missing release if devm_clk_hw_register fails
  2020-08-09 23:11 [PATCH] clk: bcm2835: add missing release if devm_clk_hw_register fails Navid Emamdoost
@ 2020-10-14  3:01 ` Stephen Boyd
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Boyd @ 2020-10-14  3:01 UTC (permalink / raw)
  To: Eric Anholt, Florian Fainelli, Matthias Brugger,
	Michael Turquette, Nathan Chancellor, Navid Emamdoost,
	Nicolas Saenz Julienne, Ray Jui, Rikard Falkeborn, Scott Branden,
	Stefan Wahren, YueHaibing, bcm-kernel-feedback-list,
	linux-arm-kernel, linux-clk, linux-kernel, linux-rpi-kernel
  Cc: emamd001

Quoting Navid Emamdoost (2020-08-09 16:11:58)
> In the implementation of bcm2835_register_pll(), the allocated pll is
> leaked if devm_clk_hw_register() fails to register hw. Release pll if
> devm_clk_hw_register() fails.
> 
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---

Applied to clk-next

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-14  3:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-09 23:11 [PATCH] clk: bcm2835: add missing release if devm_clk_hw_register fails Navid Emamdoost
2020-10-14  3:01 ` Stephen Boyd

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).