Commit b8aba761 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'spi/fix/core' into spi-linus

parents 6ce4eac1 4b92894e
...@@ -1415,7 +1415,7 @@ int devm_spi_register_master(struct device *dev, struct spi_master *master) ...@@ -1415,7 +1415,7 @@ int devm_spi_register_master(struct device *dev, struct spi_master *master)
return -ENOMEM; return -ENOMEM;
ret = spi_register_master(master); ret = spi_register_master(master);
if (ret != 0) { if (!ret) {
*ptr = master; *ptr = master;
devres_add(dev, ptr); devres_add(dev, ptr);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment