Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29ffcc88 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

soundwire: 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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d23fc022

drivers/soundwire/bus_type.c

+7 −8
Original line number Diff line number Diff line
@@ -83,16 +83,15 @@ static int sdw_drv_probe(struct device *dev) 
	 * attach to power domain but don't turn on (last arg)

	 */

	ret = dev_pm_domain_attach(dev, false);

	if (ret != -EPROBE_DEFER) {

	if (ret)

		return ret;



	ret = drv->probe(slave, id);

	if (ret) {

		dev_err(dev, "Probe of %s failed: %d\n", drv->name, ret);

		dev_pm_domain_detach(dev, false);

		}

	}



	if (ret)

		return ret;

	}



	/* device is probed so let's read the properties now */

	if (slave->ops && slave->ops->read_prop)