PM / Domains: Handle errors from genpd's ->attach_dev() callback

The optional genpd's ->attach_dev() callback is invoked from
__pm_genpd_add_device(). Let's add error handling from the response
from this callback and propagate the error code.

When __pm_genpd_add_device() is invoked through the generic OF-based PM
domain look-up path, the device is being probed. Returning an error
will mean the device won't be attached to its PM domain. Errors of
-EPROBE_DEFER get special treatment and is propagated to the driver
core.

Therefore this change also enables the ->attach_dev() callback to
be able to request for a deferred probe sequence.

Signed-off-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 0fd5ee127c300b16da3acd55a54fe82892e7c34d..ba4abbe4693c3e29be764d66662295dd300d41c4 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1467,8 +1467,9 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
                goto out;
        }
 
-       if (genpd->attach_dev)
-               genpd->attach_dev(genpd, dev);
+       ret = genpd->attach_dev ? genpd->attach_dev(genpd, dev) : 0;
+       if (ret)
+               goto out;
 
        genpd->device_count++;
        genpd->max_off_time_changed = true;