Skip to content

Commit 71f277a

Browse files
storulfrafaeljw
authored andcommitted
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 <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 29ffcc8 commit 71f277a

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/spi/spi.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,12 @@ static int spi_drv_probe(struct device *dev)
356356
}
357357

358358
ret = dev_pm_domain_attach(dev, true);
359-
if (ret != -EPROBE_DEFER) {
360-
ret = sdrv->probe(spi);
361-
if (ret)
362-
dev_pm_domain_detach(dev, true);
363-
}
359+
if (ret)
360+
return ret;
361+
362+
ret = sdrv->probe(spi);
363+
if (ret)
364+
dev_pm_domain_detach(dev, true);
364365

365366
return ret;
366367
}

0 commit comments

Comments
 (0)