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

Commit a1c22a4b authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Stephen Boyd
Browse files

clk: st: fix handling result of of_property_count_strings 

The function can return negative value.

The problem has been detected using proposed semantic patch
scripts/coccinelle/tests/assign_signed_to_unsigned.cocci [1].

[1]: http://permalink.gmane.org/gmane.linux.kernel/2046107



Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 8334c0e7

drivers/clk/st/clk-flexgen.c

+4 −3
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ static void __init st_of_flexgen_setup(struct device_node *np) 
	int num_parents, i;

	spinlock_t *rlock = NULL;

	unsigned long flex_flags = 0;

	int ret;



	pnode = of_get_parent(np);

	if (!pnode)
@@ -285,13 +286,13 @@ static void __init st_of_flexgen_setup(struct device_node *np) 
	if (!clk_data)

		goto err;



	clk_data->clk_num = of_property_count_strings(np ,

			"clock-output-names");

	if (clk_data->clk_num <= 0) {

	ret = of_property_count_strings(np, "clock-output-names");

	if (ret <= 0) {

		pr_err("%s: Failed to get number of output clocks (%d)",

				__func__, clk_data->clk_num);

		goto err;

	}

	clk_data->clk_num = ret;



	clk_data->clks = kcalloc(clk_data->clk_num, sizeof(struct clk *),

			GFP_KERNEL);