diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-05-19 13:25:48 +0200 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2014-06-19 13:52:31 +0200 |
| commit | 8d2f9e8eca807479c83c8f765b6859838da618eb (patch) | |
| tree | a433b3d127650d24d7ee4d54451c399fc2bf718b | |
| parent | clk: ti: apll: not allocating enough data (diff) | |
| download | linux-8d2f9e8eca807479c83c8f765b6859838da618eb.tar.xz linux-8d2f9e8eca807479c83c8f765b6859838da618eb.zip | |
clk: ti: dra7: return error code in failure case
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>
| -rw-r--r-- | drivers/clk/ti/apll.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c index 18dbaf128a39..72d97279eae1 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; } |