1 files changed, 17 insertions, 2 deletions

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 42615b419dfb..25edc9a3a489 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -168,6 +168,7 @@ static int rpm_check_suspend_allowed(struct device *dev)
 static int rpm_idle(struct device *dev, int rpmflags)
 {
         int (*callback)(struct device *);
+        int (*domain_callback)(struct device *);
         int retval;
 
         retval = rpm_check_suspend_allowed(dev);
@@ -222,10 +223,19 @@ static int rpm_idle(struct device *dev, int rpmflags)
         else
                 callback = NULL;
 
-        if (callback) {
+        if (dev->pwr_domain)
+                domain_callback = dev->pwr_domain->ops.runtime_idle;
+        else
+                domain_callback = NULL;
+
+        if (callback || domain_callback) {
                 spin_unlock_irq(&dev->power.lock);
 
-                callback(dev);
+                if (domain_callback)
+                        retval = domain_callback(dev);
+
+                if (!retval && callback)
+                        callback(dev);
 
                 spin_lock_irq(&dev->power.lock);
         }
@@ -390,6 +400,8 @@ static int rpm_suspend(struct device *dev, int rpmflags)
                 else
                         pm_runtime_cancel_pending(dev);
         } else {
+                if (dev->pwr_domain)
+                        rpm_callback(dev->pwr_domain->ops.runtime_suspend, dev);
  no_callback:
                 __update_runtime_status(dev, RPM_SUSPENDED);
                 pm_runtime_deactivate_timer(dev);
@@ -569,6 +581,9 @@ static int rpm_resume(struct device *dev, int rpmflags)
 
         __update_runtime_status(dev, RPM_RESUMING);
 
+        if (dev->pwr_domain)
+                rpm_callback(dev->pwr_domain->ops.runtime_resume, dev);
+
         if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume)
                 callback = dev->bus->pm->runtime_resume;
         else if (dev->type && dev->type->pm && dev->type->pm->runtime_resume)