Commit da0f0b2c authored Sep 29, 2013 by Tomasz Figa Committed by Mike Turquette Oct 01, 2013

clk: Correct lookup logic in clk_fetch_parent_index()

This function is supposed to iterate over all parents of given child
clock to find the index of given parent clock in its parent list,
using parent cache if possible and falling back to string compare
otherwise. However currently the logic falls back to string compare in
every iteration in which clock cache entry does not match given parent,
due to wrong check conditions.

This patch corrects the logic to continue the loop if parent cache entry
is present and does not match requested parent clock. In addition,
redundant checks for parent cache array presence are removed, because it
is always allocated in the beginning of the function.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

parent 96a7ed90

drivers/clk/clk.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1097,10 +1097,13 @@ static int clk_fetch_parent_index(struct clk clk, struct clk parent)
		* them now to avoid future calls to __clk_lookup.
		*/
		for (i = 0; i < clk->num_parents; i++) {
		if (clk->parents && clk->parents[i] == parent)
		if (clk->parents[i] == parent)
		return i;
		else if (!strcmp(clk->parent_names[i], parent->name)) {
		if (clk->parents)

		if (clk->parents[i])
		continue;

		if (!strcmp(clk->parent_names[i], parent->name)) {
		clk->parents[i] = __clk_lookup(parent->name);
		return i;
		}

Admin message