Merge branch 'pm-clk'

* pm-clk:
  PM / clock_ops: report clock errors from clk_enable()
  PM / clock_ops: check return of clk_enable() in pm_clk_resume()
  PM / clock_ops: fix up clk prepare/unprepare count

1 files changed, 25 insertions, 5 deletions

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 9d8fde709390..e870bbe9ec4e 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -33,6 +33,21 @@ struct pm_clock_entry {
 };
 
 /**
+ * pm_clk_enable - Enable a clock, reporting any errors
+ * @dev: The device for the given clock
+ * @clk: The clock being enabled.
+ */
+static inline int __pm_clk_enable(struct device *dev, struct clk *clk)
+{
+        int ret = clk_enable(clk);
+        if (ret)
+                dev_err(dev, "%s: failed to enable clk %p, error %d\n",
+                        __func__, clk, ret);
+
+        return ret;
+}
+
+/**
  * pm_clk_acquire - Acquire a device clock.
  * @dev: Device whose clock is to be acquired.
  * @ce: PM clock entry corresponding to the clock.
@@ -43,6 +58,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 +115,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);
@@ -249,6 +267,7 @@ int pm_clk_resume(struct device *dev)
         struct pm_subsys_data *psd = dev_to_psd(dev);
         struct pm_clock_entry *ce;
         unsigned long flags;
+        int ret;
 
         dev_dbg(dev, "%s()\n", __func__);
 
@@ -259,8 +278,9 @@ int pm_clk_resume(struct device *dev)
 
         list_for_each_entry(ce, &psd->clock_list, node) {
                 if (ce->status < PCE_STATUS_ERROR) {
-                        clk_enable(ce->clk);
-                        ce->status = PCE_STATUS_ENABLED;
+                        ret = __pm_clk_enable(dev, ce->clk);
+                        if (!ret)
+                                ce->status = PCE_STATUS_ENABLED;
                 }
         }
 
@@ -376,7 +396,7 @@ int pm_clk_resume(struct device *dev)
         spin_lock_irqsave(&psd->lock, flags);
 
         list_for_each_entry(ce, &psd->clock_list, node)
-                clk_enable(ce->clk);
+                __pm_clk_enable(dev, ce->clk);
 
         spin_unlock_irqrestore(&psd->lock, flags);