|
@@ -572,17 +572,16 @@ static int platform_drv_probe(struct device *_dev)
|
|
|
return ret;
|
|
|
|
|
|
ret = dev_pm_domain_attach(_dev, true);
|
|
|
- if (ret != -EPROBE_DEFER) {
|
|
|
- if (drv->probe) {
|
|
|
- ret = drv->probe(dev);
|
|
|
- if (ret)
|
|
|
- dev_pm_domain_detach(_dev, true);
|
|
|
- } else {
|
|
|
- /* don't fail if just dev_pm_domain_attach failed */
|
|
|
- ret = 0;
|
|
|
- }
|
|
|
+ if (ret)
|
|
|
+ goto out;
|
|
|
+
|
|
|
+ if (drv->probe) {
|
|
|
+ ret = drv->probe(dev);
|
|
|
+ if (ret)
|
|
|
+ dev_pm_domain_detach(_dev, true);
|
|
|
}
|
|
|
|
|
|
+out:
|
|
|
if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
|
|
|
dev_warn(_dev, "probe deferral not supported\n");
|
|
|
ret = -ENXIO;
|