diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-02 23:22:20 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-02 23:22:20 -0300 |
| commit | 5c545e1fb127a4b11ddc5f1a5ed066b853dd1a1a (patch) | |
| tree | d4cd913bc79d37d32756a9bffbeedabf93e32579 /drivers/base | |
| parent | b4b7ff4b08e691656c9d77c758fc355833128ac0 (diff) | |
Linux-libre 4.4.1-gnupck-4.4.1-gnu
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 1dd6d3bf1..176b59f5b 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) { |