clk: ti: dra7: return error code in failure case
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 19 May 2014 11:25:48 +0000 (19:25 +0800)
committerTero Kristo <t-kristo@ti.com>
Thu, 19 Jun 2014 11:52:31 +0000 (14:52 +0300)
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@lip6.fr>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
drivers/clk/ti/apll.c

index 18dbaf1..72d9727 100644 (file)
@@ -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;
 }