clk: st: fix handling result of of_property_count_strings
authorAndrzej Hajda <a.hajda@samsung.com>
Thu, 24 Sep 2015 14:00:16 +0000 (16:00 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Thu, 1 Oct 2015 22:21:50 +0000 (15:21 -0700)
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: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/st/clk-flexgen.c

index bd355ee33766b807556c848fcabeeb0c9293a187..24d99594c0b30d667251754982ebff75e1a56e26 100644 (file)
@@ -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);