|
@@ -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;
|