diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 21:46:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-29 21:46:41 +0100 |
| commit | 64adb0192ff309051492b34139bb842024ebb119 (patch) | |
| tree | 4ac783c6f5616f015688275b93b6763dc4253ce3 /drivers/base | |
| parent | 26ab93438fbacc653c60ea4d148b6ca16919ab1b (diff) | |
| parent | c122f27e1c1bada4cdf19669afed5a00a69bc5a5 (diff) | |
Merge branch 'pm-runtime'
* pm-runtime:
base: power - use clk_prepare_enable and clk_prepare_disable
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/clock_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index eb78e9640c4..9d8fde70939 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -99,7 +99,7 @@ static void __pm_clk_remove(struct pm_clock_entry *ce) if (ce->status < PCE_STATUS_ERROR) { if (ce->status == PCE_STATUS_ENABLED) - clk_disable(ce->clk); + clk_disable_unprepare(ce->clk); if (ce->status >= PCE_STATUS_ACQUIRED) clk_put(ce->clk); @@ -396,7 +396,7 @@ static void enable_clock(struct device *dev, const char *con_id) clk = clk_get(dev, con_id); if (!IS_ERR(clk)) { - clk_enable(clk); + clk_prepare_enable(clk); clk_put(clk); dev_info(dev, "Runtime PM disabled, clock forced on.\n"); } @@ -413,7 +413,7 @@ static void disable_clock(struct device *dev, const char *con_id) clk = clk_get(dev, con_id); if (!IS_ERR(clk)) { - clk_disable(clk); + clk_disable_unprepare(clk); clk_put(clk); dev_info(dev, "Runtime PM disabled, clock forced off.\n"); } |