1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 6807b7f0879d..600614f2193b 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -60,6 +60,7 @@ struct clk_core {
         struct clk_core         *new_child;
         unsigned long           flags;
         bool                    orphan;
+        bool                    rpm_enabled;
         bool                    need_sync;
         bool                    boot_enabled;
         unsigned int            enable_count;
@@ -97,9 +98,9 @@ struct clk {
 /***           runtime pm          ***/
 static int clk_pm_runtime_get(struct clk_core *core)
 {
-        int ret = 0;
+        int ret;
 
-        if (!core->dev)
+        if (!core->rpm_enabled)
                 return 0;
 
         ret = pm_runtime_get_sync(core->dev);
@@ -108,7 +109,7 @@ static int clk_pm_runtime_get(struct clk_core *core)
 
 static void clk_pm_runtime_put(struct clk_core *core)
 {
-        if (!core->dev)
+        if (!core->rpm_enabled)
                 return;
 
         pm_runtime_put_sync(core->dev);
@@ -228,7 +229,7 @@ static bool clk_core_is_enabled(struct clk_core *core)
          * taking enable spinlock, but the below check is needed if one tries
          * to call it from other places.
          */
-        if (core->dev) {
+        if (core->rpm_enabled) {
                 pm_runtime_get_noresume(core->dev);
                 if (!pm_runtime_active(core->dev)) {
                         ret = false;
@@ -238,7 +239,7 @@ static bool clk_core_is_enabled(struct clk_core *core)
 
         ret = core->ops->is_enabled(core->hw);
 done:
-        if (core->dev)
+        if (core->rpm_enabled)
                 pm_runtime_put(core->dev);
 
         return ret;
@@ -3351,7 +3352,8 @@ struct clk *clk_register(struct device *dev, struct clk_hw *hw)
         core->ops = hw->init->ops;
 
         if (dev && pm_runtime_enabled(dev))
-                core->dev = dev;
+                core->rpm_enabled = true;
+        core->dev = dev;
         if (dev && dev->driver)
                 core->owner = dev->driver->owner;
         core->hw = hw;