diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-28 11:31:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-28 11:31:35 +0000 |
| commit | b8aba7611b9a5a1f67f081be84270c67baf4d2c3 (patch) | |
| tree | bc21aafb33038ca6b30fd698997ab460b23ea1c2 /drivers/spi | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| parent | 4b92894ee70c9110c083aa60b0663d357495864d (diff) | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 18cc625d887f..349ebba4b199 100644 --- 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 { |