From: Shawn Guo Date: Thu, 12 Apr 2012 12:50:19 +0000 (+0800) Subject: clk: propagate round_rate for CLK_SET_RATE_PARENT case X-Git-Tag: v3.5-rc1~71^2~6^2~14 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f4d8af2e5ae6294d5e2220d3963def6f7ffc0873;p=~emulex%2Finfiniband.git clk: propagate round_rate for CLK_SET_RATE_PARENT case Need to propagate round_rate call for the clk that has no .round_rate operation but with flag CLK_SET_RATE_PARENT set. For example, clk_mux is a clk with no .round_rate operation. However, it could likely be in a clk_set_rate propagation path, saying it has parent clk who has .round_rate and .set_rate operations. Signed-off-by: Shawn Guo Signed-off-by: Mike Turquette --- diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 62ecac53b0a..c6e8866289b 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -587,8 +587,12 @@ unsigned long __clk_round_rate(struct clk *clk, unsigned long rate) if (!clk) return -EINVAL; - if (!clk->ops->round_rate) - return clk->rate; + if (!clk->ops->round_rate) { + if (clk->flags & CLK_SET_RATE_PARENT) + return __clk_round_rate(clk->parent, rate); + else + return clk->rate; + } if (clk->parent) parent_rate = clk->parent->rate;