[PATCH 03/94] clk: ti: dra7: return error code in failure case

Sam Asadi asadi.samuel at gmail.com
Tue Jul 15 17:00:18 UTC 2014


From: Julia Lawall <Julia.Lawall at lip6.fr>

Add a returned error code in the MAX_APLL_WAIT_TRIES case.  Remove the
updating of the return variable r to 0 if MAX_APLL_WAIT_TRIES is not yet
reached, because r is already 0 at this point.

Signed-off-by: Julia Lawall <Julia.Lawall at lip6.fr>
Signed-off-by: Tero Kristo <t-kristo at ti.com>
Signed-off-by: sam-the-6 <asadi.samuel at gmail.com>
---
 drivers/clk/ti/apll.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c
index 18dbaf12..72d9727 100644
--- a/drivers/clk/ti/apll.c
+++ b/drivers/clk/ti/apll.c
@@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw)
 	if (i == MAX_APLL_WAIT_TRIES) {
 		pr_warn("clock: %s failed transition to '%s'\n",
 			clk_name, (state) ? "locked" : "bypassed");
-	} else {
+		r = -EBUSY;
+	} else
 		pr_debug("clock: %s transition to '%s' in %d loops\n",
 			 clk_name, (state) ? "locked" : "bypassed", i);
 
-		r = 0;
-	}
-
 	return r;
 }
 
-- 
1.7.10.4



More information about the devel mailing list