aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/domain.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 52172754ff78..d7e71b5b080e 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -75,6 +75,12 @@ static int genpd_start_dev(struct generic_pm_domain *genpd, struct device *dev)
75 start_latency_ns, "start"); 75 start_latency_ns, "start");
76} 76}
77 77
78static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd,
79 struct device *dev)
80{
81 return GENPD_DEV_CALLBACK(genpd, int, start, dev);
82}
83
78static bool genpd_sd_counter_dec(struct generic_pm_domain *genpd) 84static bool genpd_sd_counter_dec(struct generic_pm_domain *genpd)
79{ 85{
80 bool ret = false; 86 bool ret = false;
@@ -626,7 +632,7 @@ static int pm_genpd_runtime_resume(struct device *dev)
626 632
627 /* If power.irq_safe, the PM domain is never powered off. */ 633 /* If power.irq_safe, the PM domain is never powered off. */
628 if (dev->power.irq_safe) 634 if (dev->power.irq_safe)
629 return genpd_start_dev(genpd, dev); 635 return genpd_start_dev_no_timing(genpd, dev);
630 636
631 mutex_lock(&genpd->lock); 637 mutex_lock(&genpd->lock);
632 ret = __pm_genpd_poweron(genpd); 638 ret = __pm_genpd_poweron(genpd);