clk: Propagate any error return from debug_init()

If the .debug_init op is provided, it will be called by
clk_debug_create_one(). If debug_init() returns an error code,
clk_debug_create_one() will return -ENOMEM, regardless of the
value returned from debug_init(). Tweak the code to return
the actual value returned by debug_init() instead.

Signed-off-by: Chris Brand <chris.brand@linaro.org>
Reviewed-by: Matt Porter <mporter@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f95590a1e28e..b76fa69b44cb 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -284,9 +284,11 @@ static int clk_debug_create_one(struct clk *clk, struct dentry *pdentry)
         if (!d)
                 goto err_out;
 
-        if (clk->ops->debug_init)
-                if (clk->ops->debug_init(clk->hw, clk->dentry))
+        if (clk->ops->debug_init) {
+                ret = clk->ops->debug_init(clk->hw, clk->dentry);
+                if (ret)
                         goto err_out;
+        }
 
         ret = 0;
         goto out;