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

git-mirror · Nov 28, 2013 · b8aba76 · b8aba76
2 parents 6ce4eac + 4b92894
commit b8aba76
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 {