Commit 5d2043fb authored Jan 14, 2014 by Mike Turquette

clk: composite: pass mux_hw into determine_rate



The composite clock's .determine_rate implementation can call the
underyling .determine_rate callback corresponding to rate_hw or the
underlying .determine_rate callback corresponding to mux_hw. In both
cases we pass in rate_hw, which is wrong. Fixed by passing mux_hw into
the correct callback.

Reported-by: Lemon Dai <dailemon.gl@gmail.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

parent 119754e5

drivers/clk/clk-composite.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
		best_parent_p);
		} else if (mux_hw && mux_ops && mux_ops->determine_rate) {
		mux_hw->clk = hw->clk;
		return mux_ops->determine_rate(rate_hw, rate, best_parent_rate,
		return mux_ops->determine_rate(mux_hw, rate, best_parent_rate,
		best_parent_p);
		} else {
		pr_err("clk: clk_composite_determine_rate function called, but no mux or rate callback set!\n");