clk: qcom: common: fix legacy board-clock registration
authorJohan Hovold <johan@kernel.org>
Sat, 11 Nov 2017 16:29:28 +0000 (17:29 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Dec 2017 08:53:12 +0000 (09:53 +0100)
[ Upstream commit 43a51019cc8ff1b1cd2ba72e86563beb40d356fc ]

Make sure to search only the child nodes of "/clocks", rather than the
whole device-tree depth-first starting at "/clocks" when determining
whether to register a fixed clock in the legacy board-clock registration
helper.

Fixes: ee15faffef11 ("clk: qcom: common: Add API to register board clocks backwards compatibly")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/qcom/common.c

index d523991c945f9d4cbcd047c8a7edbb405d0e85ba..28ceaf1e99371a15b3c3deaf20f99c6155863a22 100644 (file)
@@ -143,8 +143,10 @@ static int _qcom_cc_register_board_clk(struct device *dev, const char *path,
        int ret;
 
        clocks_node = of_find_node_by_path("/clocks");
-       if (clocks_node)
-               node = of_find_node_by_name(clocks_node, path);
+       if (clocks_node) {
+               node = of_get_child_by_name(clocks_node, path);
+               of_node_put(clocks_node);
+       }
 
        if (!node) {
                fixed = devm_kzalloc(dev, sizeof(*fixed), GFP_KERNEL);