summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-08-01 11:14:17 +0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:00:34 +0900
commit7433dce716f15c9d68ad973c02688c04b4365387 (patch)
tree67f9da30eeed8c61902b692bde44e06bc77e3c90 /drivers
parentfd034b76333cfde9741f8b374f65139b6d94a379 (diff)
downloadlinux-3.10-7433dce716f15c9d68ad973c02688c04b4365387.tar.gz
linux-3.10-7433dce716f15c9d68ad973c02688c04b4365387.tar.bz2
linux-3.10-7433dce716f15c9d68ad973c02688c04b4365387.zip
clk: checking wrong variable in __set_clk_parents()
There is a cut and paste bug so we check "pclk" instead of "clk". Change-Id: Ie72f6d614d5e5a2756f60808aad3db92f46ed790 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers')
-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 1f73019a27c..4e1bda7abc8 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;
}