25 lines
689 B
Diff
25 lines
689 B
Diff
|
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
|
||
|
|
index 1dd6d3b..176b59f 100644
|
||
|
|
--- a/drivers/base/platform.c
|
||
|
|
+++ b/drivers/base/platform.c
|
||
|
|
@@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
ret = dev_pm_domain_attach(_dev, true);
|
||
|
|
- if (ret != -EPROBE_DEFER && drv->probe) {
|
||
|
|
- ret = drv->probe(dev);
|
||
|
|
- if (ret)
|
||
|
|
- dev_pm_domain_detach(_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 (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
|