diff options
| author | Andrzej Hajda <a.hajda@samsung.com> | 2015-09-24 16:00:16 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-02 00:21:50 +0200 |
| commit | a1c22a4be7983f64324e960f7ba373784c0c8289 (patch) | |
| tree | 92868f65de87f9b387d78f1aeb3815e0143dd71e /drivers/clk/st | |
| parent | clk: rockchip: don't use clk_ APIs in the pll init-callback (diff) | |
| download | linux-a1c22a4be7983f64324e960f7ba373784c0c8289.tar.xz linux-a1c22a4be7983f64324e960f7ba373784c0c8289.zip | |
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: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/st')
| -rw-r--r-- | drivers/clk/st/clk-flexgen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c index bd355ee33766..24d99594c0b3 100644 --- a/drivers/clk/st/clk-flexgen.c +++ b/drivers/clk/st/clk-flexgen.c @@ -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); |