hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Mike Turquette 2014-01-14 12:56:01 -08:00
parent 119754e576
commit 5d2043fbe4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/clk-composite.c
View File

@ -71,7 +71,7 @@ static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
best_parent_p); best_parent_p);
} else if (mux_hw && mux_ops && mux_ops->determine_rate) { } else if (mux_hw && mux_ops && mux_ops->determine_rate) {
mux_hw->clk = hw->clk; 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); best_parent_p);
} else { } else {
pr_err("clk: clk_composite_determine_rate function called, but no mux or rate callback set!\n"); pr_err("clk: clk_composite_determine_rate function called, but no mux or rate callback set!\n");