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

b8aba761 · Mark Brown · 6ce4eac1 · 4b92894e · b8aba761
Commit b8aba761 authored Nov 28, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/spi/spi.c drivers/spi/spi.c +1 -1

No files found.
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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 {