From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 6 Nov 2019 18:12:30 +0000 (+0100)
Subject: bus: ti-sysc: Adjust exception handling in sysc_child_add_named_clock()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cb6cfe2eaed171b5a2e575fa3f0cf0924b5bd1d2;p=linux.git

bus: ti-sysc: Adjust exception handling in sysc_child_add_named_clock()

Add a jump target so that a call of the function “clk_put”
can be better reused at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 99d7356e245be..56887c6877a7b 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -1778,9 +1778,8 @@ static int sysc_child_add_named_clock(struct sysc *ddata,
 
 	clk = clk_get(child, name);
 	if (!IS_ERR(clk)) {
-		clk_put(clk);
-
-		return -EEXIST;
+		error = -EEXIST;
+		goto put_clk;
 	}
 
 	clk = clk_get(ddata->dev, name);
@@ -1790,7 +1789,7 @@ static int sysc_child_add_named_clock(struct sysc *ddata,
 	l = clkdev_create(clk, name, dev_name(child));
 	if (!l)
 		error = -ENOMEM;
-
+put_clk:
 	clk_put(clk);
 
 	return error;