Commit 9e85a6f9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull fix to common clk framework from Michael Turquette:
 "The previous set of common clk fixes for -rc5 left an uninitialized
  int which could lead to bad array indexing when switching clock
  parents.  The issue is fixed with a trivial change to the code flow in
  __clk_set_parent."

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: fix parent validation in __clk_set_parent()
parents 6c8addcb 863b1327
...@@ -1067,26 +1067,24 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent) ...@@ -1067,26 +1067,24 @@ static int __clk_set_parent(struct clk *clk, struct clk *parent)
old_parent = clk->parent; old_parent = clk->parent;
/* find index of new parent clock using cached parent ptrs */ if (!clk->parents)
if (clk->parents)
for (i = 0; i < clk->num_parents; i++)
if (clk->parents[i] == parent)
break;
else
clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents), clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
GFP_KERNEL); GFP_KERNEL);
/* /*
* find index of new parent clock using string name comparison * find index of new parent clock using cached parent ptrs,
* also try to cache the parent to avoid future calls to __clk_lookup * or if not yet cached, use string name comparison and cache
* them now to avoid future calls to __clk_lookup.
*/ */
if (i == clk->num_parents) for (i = 0; i < clk->num_parents; i++) {
for (i = 0; i < clk->num_parents; i++) if (clk->parents && clk->parents[i] == parent)
if (!strcmp(clk->parent_names[i], parent->name)) { break;
else if (!strcmp(clk->parent_names[i], parent->name)) {
if (clk->parents) if (clk->parents)
clk->parents[i] = __clk_lookup(parent->name); clk->parents[i] = __clk_lookup(parent->name);
break; break;
} }
}
if (i == clk->num_parents) { if (i == clk->num_parents) {
pr_debug("%s: clock %s is not a possible parent of clock %s\n", pr_debug("%s: clock %s is not a possible parent of clock %s\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment