diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-07-03 11:55:42 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-07-03 11:55:42 -0700 |
| commit | cdae1730d0c6b644b6df3a97618be89fde5e074d (patch) | |
| tree | 4f1012d672dab49029e1fbef1694087b4d3deb0f /drivers/clk/ti/apll.c | |
| parent | fb2b3c9f68574738c70b9df5fc2bea40f91dd8be (diff) | |
| parent | c556bcddc78096caeb46dbe3ad0314dd951f1665 (diff) | |
| download | linux-cdae1730d0c6b644b6df3a97618be89fde5e074d.tar.bz2 | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/ti/apll.c')
| -rw-r--r-- | drivers/clk/ti/apll.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c index 5428c9c547cd..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; } @@ -338,7 +336,7 @@ static void __init of_omap2_apll_setup(struct device_node *node) const char *parent_name; u32 val; - ad = kzalloc(sizeof(*clk_hw), GFP_KERNEL); + ad = kzalloc(sizeof(*ad), GFP_KERNEL); clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL); init = kzalloc(sizeof(*init), GFP_KERNEL); |