From 22cd4b946481fb2aa5b7bdbbb8fc3bf7b423d341 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 6 Aug 2012 01:47:29 +0200 Subject: [PATCH] --- yaml --- r: 328663 b: refs/heads/master c: e2e3e4e51ebdcd757079bd7ec5dcc9dfb2ebce24 h: refs/heads/master i: 328661: 3c5a14cc37dd2926ad2117caa44c1eee316c41f3 328659: 6596077a3aebcdb285485234887e23a14c669f98 328655: 8ccc494dbac87c46afd88423783fadebd2a64bc6 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/domain.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d103d9e2741..90c1e110eace 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbf374142dd7a3c394ec124ebe7339a6c412d9b6 +refs/heads/master: e2e3e4e51ebdcd757079bd7ec5dcc9dfb2ebce24 diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c index 52172754ff78..d7e71b5b080e 100644 --- a/trunk/drivers/base/power/domain.c +++ b/trunk/drivers/base/power/domain.c @@ -75,6 +75,12 @@ static int genpd_start_dev(struct generic_pm_domain *genpd, struct device *dev) start_latency_ns, "start"); } +static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd, + struct device *dev) +{ + return GENPD_DEV_CALLBACK(genpd, int, start, dev); +} + static bool genpd_sd_counter_dec(struct generic_pm_domain *genpd) { bool ret = false; @@ -626,7 +632,7 @@ static int pm_genpd_runtime_resume(struct device *dev) /* If power.irq_safe, the PM domain is never powered off. */ if (dev->power.irq_safe) - return genpd_start_dev(genpd, dev); + return genpd_start_dev_no_timing(genpd, dev); mutex_lock(&genpd->lock); ret = __pm_genpd_poweron(genpd);