diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2018-04-26 10:53:10 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-14 22:58:46 +0200 |
| commit | 71f277a7bf0b0e65e9571940057c70efc4326bc5 (patch) | |
| tree | 99f4028937658f41bba00a7390be9a9e39aed14c | |
| parent | 29ffcc88f2065f83e97e371f688c0255a7a7d907 (diff) | |
| download | linux-stable-71f277a7bf0b0e65e9571940057c70efc4326bc5.tar.gz linux-stable-71f277a7bf0b0e65e9571940057c70efc4326bc5.tar.bz2 linux-stable-71f277a7bf0b0e65e9571940057c70efc4326bc5.zip | |
spi: Respect all error codes from dev_pm_domain_attach()
The limitation of being able to check only for -EPROBE_DEFER from
dev_pm_domain_attach() has been removed. Hence let's respect all error
codes and bail out accordingly.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/spi/spi.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 7b213faa0a2b..eeab67f50580 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -356,11 +356,12 @@ static int spi_drv_probe(struct device *dev) } ret = dev_pm_domain_attach(dev, true); - if (ret != -EPROBE_DEFER) { - ret = sdrv->probe(spi); - if (ret) - dev_pm_domain_detach(dev, true); - } + if (ret) + return ret; + + ret = sdrv->probe(spi); + if (ret) + dev_pm_domain_detach(dev, true); return ret; } |