summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-08-01 10:14:17 +0200
committerMike Turquette <mturquette@linaro.org>2014-08-01 19:47:26 +0200
commit6ba19bf066624f0090fd3beaea115ad55cafb753 (patch)
tree2eb59561fbd30d854da07c33345efd968c1ebd52 /drivers/clk
parentMerge tag 'for_3.17/samsung-clk' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-6ba19bf066624f0090fd3beaea115ad55cafb753.tar.xz
linux-6ba19bf066624f0090fd3beaea115ad55cafb753.zip
clk: checking wrong variable in __set_clk_parents()
There is a cut and paste bug so we check "pclk" instead of "clk". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk-conf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
index 1f73019a27c8..4e1bda7abc88 100644
--- a/drivers/clk/clk-conf.c
+++ b/drivers/clk/clk-conf.c
@@ -55,10 +55,10 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)
goto err;
}
clk = of_clk_get_by_clkspec(&clkspec);
- if (IS_ERR(pclk)) {
+ if (IS_ERR(clk)) {
pr_warn("clk: couldn't get parent clock %d for %s\n",
index, node->full_name);
- rc = PTR_ERR(pclk);
+ rc = PTR_ERR(clk);
goto err;
}