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

This commit is contained in:
Mark Brown 2013-11-28 11:31:35 +00:00
commit b8aba7611b

View File

@ -1415,7 +1415,7 @@ int devm_spi_register_master(struct device *dev, struct spi_master *master)
return -ENOMEM;
ret = spi_register_master(master);
if (ret != 0) {
if (!ret) {
*ptr = master;
devres_add(dev, ptr);
} else {