projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6ce4eac
)
Merge remote-tracking branch 'spi/fix/core' into spi-linus
author
Mark Brown
<broonie@linaro.org>
Thu, 28 Nov 2013 11:31:35 +0000
(11:31 +0000)
committer
Mark Brown
<broonie@linaro.org>
Thu, 28 Nov 2013 11:31:35 +0000
(11:31 +0000)
drivers/spi/spi.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/spi/spi.c
b/drivers/spi/spi.c
index 18cc625d887f796aed4b082eb2366262aec8aaa8..349ebba4b1992afdf703e689022dfbf67b07f626 100644
(file)
--- 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 {