PM / Domains: Propagate start and restore errors during runtime resume

During runtime resume the return values of the start and restore steps
are ignored. As a result drivers are not notified of runtime resume
failures and can't propagate them up. Fix it by returning an error if
either the start or restore step fails, and clean up properly in the
error path.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 9e59543d314c4b0b5247db069bbbfd900f389c8d..7e44ae3366db3b634ec5579459ef5dbaaf63d124 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -487,8 +487,13 @@ static int pm_genpd_runtime_resume(struct device *dev)
        if (timed && runtime_pm)
                time_start = ktime_get();
 
-       genpd_start_dev(genpd, dev);
-       genpd_restore_dev(genpd, dev);
+       ret = genpd_start_dev(genpd, dev);
+       if (ret)
+               goto err_poweroff;
+
+       ret = genpd_restore_dev(genpd, dev);
+       if (ret)
+               goto err_stop;
 
        /* Update resume latency value if the measured time exceeds it. */
        if (timed && runtime_pm) {
@@ -503,6 +508,17 @@ static int pm_genpd_runtime_resume(struct device *dev)
        }
 
        return 0;
+
+err_stop:
+       genpd_stop_dev(genpd, dev);
+err_poweroff:
+       if (!dev->power.irq_safe) {
+               mutex_lock(&genpd->lock);
+               genpd_poweroff(genpd, 0);
+               mutex_unlock(&genpd->lock);
+       }
+
+       return ret;
 }
 
 static bool pd_ignore_unused;