Compiler optimizes code someway that even if clk->parents
is not NULL it tries to allocate parents array. Change the
condition so that compiler does not optimize it in wrong
way.
Also, initialize i to num_parents to make sure parent
is searched using parent name if parents is NULL.
Signed-off-by: Prashant Gaikwad
---
Mike,
There could be some other way to fix problem. I have not
debugged it in detail but I think this simple change should do.
drivers/clk/clk.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 026d901..b28f2ae 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1066,18 +1066,18 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent)
struct clk *old_parent;
unsigned long flags;
int ret = -EINVAL;
- u8 i;
+ u8 i = clk->num_parents;
old_parent = clk->parent;
/* find index of new parent clock using cached parent ptrs */
- if (clk->parents)
+ if (!clk->parents)
+ clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
+ GFP_KERNEL);
+ else
for (i = 0; i < clk->num_parents; i++)
if (clk->parents[i] == parent)
break;
- else
- clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
- GFP_KERNEL);
/*
* find index of new parent clock using string name comparison
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo.RemoveThis@vger.kernel.org
More majordomo info at
http://vger.kernel.org/majordomo-info.html
Please read the FAQ at
http://www.tux.org/lkml/ 
Linux