Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 281714e4 authored by Clément Léger's avatar Clément Léger Committed by Greg Kroah-Hartman
Browse files

clk: add missing of_node_put() in "assigned-clocks" property parsing 



[ Upstream commit 27a6e1b09a782517fddac91259970ac466a3f7b6 ]

When returning from of_parse_phandle_with_args(), the np member of the
of_phandle_args structure should be put after usage. Add missing
of_node_put() calls in both __set_clk_parents() and __set_clk_rates().

Fixes: 86be408b ("clk: Support for clock parents and rates assigned from device tree")
Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
Link: https://lore.kernel.org/r/20230131083227.10990-1-clement.leger@bootlin.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9551abd9

drivers/clk/clk-conf.c

+10 −2
Original line number Diff line number Diff line
@@ -36,9 +36,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
			else

				return rc;

		}

		if (clkspec.np == node && !clk_supplier)

		if (clkspec.np == node && !clk_supplier) {

			of_node_put(clkspec.np);

			return 0;

		}

		pclk = of_clk_get_from_provider(&clkspec);

		of_node_put(clkspec.np);

		if (IS_ERR(pclk)) {

			if (PTR_ERR(pclk) != -EPROBE_DEFER)

				pr_warn("clk: couldn't get parent clock %d for %pOF\n",
@@ -51,10 +54,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) 
		if (rc < 0)

			goto err;

		if (clkspec.np == node && !clk_supplier) {

			of_node_put(clkspec.np);

			rc = 0;

			goto err;

		}

		clk = of_clk_get_from_provider(&clkspec);

		of_node_put(clkspec.np);

		if (IS_ERR(clk)) {

			if (PTR_ERR(clk) != -EPROBE_DEFER)

				pr_warn("clk: couldn't get assigned clock %d for %pOF\n",
@@ -96,10 +101,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier) 
				else

					return rc;

			}

			if (clkspec.np == node && !clk_supplier)

			if (clkspec.np == node && !clk_supplier) {

				of_node_put(clkspec.np);

				return 0;

			}



			clk = of_clk_get_from_provider(&clkspec);

			of_node_put(clkspec.np);

			if (IS_ERR(clk)) {

				if (PTR_ERR(clk) != -EPROBE_DEFER)

					pr_warn("clk: couldn't get clock %d for %pOF\n",