diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2014-04-28 09:48:53 -0400 |
|---|---|---|
| committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2014-04-28 09:48:53 -0400 |
| commit | 16bc9f6a002c6c97b4ef335d8a1930765bc279a6 (patch) | |
| tree | 7cb22f984ecd59a35ccff8c7b52a41f65363a78f | |
| parent | bee707a7b75c4784b674261d0d1190b1e20d6a29 (diff) | |
| parent | ef3156f18e71b2f8ecc73bb6797bac287c874438 (diff) | |
| download | keystone-v3.13/master.tar.gz | |
Merge branch 'v3.13/misc-cherry-picks' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/keystone into v3.13/masterv3.13/master
| -rw-r--r-- | drivers/base/power/clock_ops.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index 9d8fde709390e8..b9dd8fac87d788 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -43,6 +43,7 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce) if (IS_ERR(ce->clk)) { ce->status = PCE_STATUS_ERROR; } else { + clk_prepare(ce->clk); ce->status = PCE_STATUS_ACQUIRED; dev_dbg(dev, "Clock %s managed by runtime PM.\n", ce->con_id); } @@ -99,10 +100,12 @@ static void __pm_clk_remove(struct pm_clock_entry *ce) if (ce->status < PCE_STATUS_ERROR) { if (ce->status == PCE_STATUS_ENABLED) - clk_disable_unprepare(ce->clk); + clk_disable(ce->clk); - if (ce->status >= PCE_STATUS_ACQUIRED) + if (ce->status >= PCE_STATUS_ACQUIRED) { + clk_unprepare(ce->clk); clk_put(ce->clk); + } } kfree(ce->con_id); |