Commit 71f277a7 authored Apr 26, 2018 by Ulf Hansson Committed by Rafael J. Wysocki May 14, 2018

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>

parent 29ffcc88

drivers/spi/spi.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -356,11 +356,12 @@ static int spi_drv_probe(struct device *dev)
	}		}

	ret = dev_pm_domain_attach(dev, true);		ret = dev_pm_domain_attach(dev, true);
	if (ret != -EPROBE_DEFER) {		if (ret)
			return ret;

	ret = sdrv->probe(spi);		ret = sdrv->probe(spi);
	if (ret)		if (ret)
	dev_pm_domain_detach(dev, true);		dev_pm_domain_detach(dev, true);
	}

	return ret;		return ret;
	}		}