Patch "clk: rockchip: free memory in error cases when registering clock branches" has been added to the 4.5-stable tree

This is a note to let you know that I've just added the patch titled

clk: rockchip: free memory in error cases when registering clock branches

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-rockchip-free-memory-in-error-cases-when-registering-clock-branches.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Shawn Lin <[email protected]>
Date: Tue, 2 Feb 2016 11:37:50 +0800
Subject: clk: rockchip: free memory in error cases when registering clock branches

From: Shawn Lin <[email protected]>

commit 2467b6745e0ae9c6cdccff24c4cceeb14b1cce3f upstream.

Add free memeory if rockchip_clk_register_branch fails.

---
 drivers/clk/rockchip/clk.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

@@ -70,7 +70,7 @@ static struct clk *rockchip_clk_register
 	if (gate_offset >= 0) {
 		gate = kzalloc(sizeof(*gate), GFP_KERNEL);
 		if (!gate)
-			return ERR_PTR(-ENOMEM);
+			goto err_gate;
 
 		gate->flags = gate_flags;
 		gate->reg = base + gate_offset;

@@ -82,7 +82,7 @@ static struct clk *rockchip_clk_register
 	if (div_width > 0) {
 		div = kzalloc(sizeof(*div), GFP_KERNEL);
 		if (!div)
-			return ERR_PTR(-ENOMEM);
+			goto err_div;
 
 		div->flags = div_flags;
 		div->reg = base + muxdiv_offset;

@@ -102,6 +102,11 @@ static struct clk *rockchip_clk_register
 				     flags);
 
 	return clk;
+err_div:
+	kfree(gate);
+err_gate:
+	kfree(mux);
+	return ERR_PTR(-ENOMEM);
 }
 
 struct rockchip_clk_frac {

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/clk-rockchip-fix-wrong-mmc-phase-shift-for-rk3228.patch queue-4.5/clk-rockchip-free-memory-in-error-cases-when-registering-clock-branches.patch queue-4.5/soc-rockchip-power-domain-fix-err-handle-while-probing.patch