diff options
Diffstat (limited to 'arch/arm/plat-omap/clock.c')
| -rw-r--r-- | arch/arm/plat-omap/clock.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 5272a2212abd..54da27af0bd5 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
| @@ -140,8 +140,12 @@ int clk_set_rate(struct clk *clk, unsigned long rate) | |||
| 140 | spin_lock_irqsave(&clockfw_lock, flags); | 140 | spin_lock_irqsave(&clockfw_lock, flags); |
| 141 | if (arch_clock->clk_set_rate) | 141 | if (arch_clock->clk_set_rate) |
| 142 | ret = arch_clock->clk_set_rate(clk, rate); | 142 | ret = arch_clock->clk_set_rate(clk, rate); |
| 143 | if (ret == 0 && (clk->flags & RATE_PROPAGATES)) | 143 | if (ret == 0) { |
| 144 | propagate_rate(clk); | 144 | if (clk->recalc) |
| 145 | clk->recalc(clk); | ||
| 146 | if (clk->flags & RATE_PROPAGATES) | ||
| 147 | propagate_rate(clk); | ||
| 148 | } | ||
| 145 | spin_unlock_irqrestore(&clockfw_lock, flags); | 149 | spin_unlock_irqrestore(&clockfw_lock, flags); |
| 146 | 150 | ||
| 147 | return ret; | 151 | return ret; |
| @@ -159,8 +163,12 @@ int clk_set_parent(struct clk *clk, struct clk *parent) | |||
| 159 | spin_lock_irqsave(&clockfw_lock, flags); | 163 | spin_lock_irqsave(&clockfw_lock, flags); |
| 160 | if (arch_clock->clk_set_parent) | 164 | if (arch_clock->clk_set_parent) |
| 161 | ret = arch_clock->clk_set_parent(clk, parent); | 165 | ret = arch_clock->clk_set_parent(clk, parent); |
| 162 | if (ret == 0 && (clk->flags & RATE_PROPAGATES)) | 166 | if (ret == 0) { |
| 163 | propagate_rate(clk); | 167 | if (clk->recalc) |
| 168 | clk->recalc(clk); | ||
| 169 | if (clk->flags & RATE_PROPAGATES) | ||
| 170 | propagate_rate(clk); | ||
| 171 | } | ||
| 164 | spin_unlock_irqrestore(&clockfw_lock, flags); | 172 | spin_unlock_irqrestore(&clockfw_lock, flags); |
| 165 | 173 | ||
| 166 | return ret; | 174 | return ret; |