diff options
| author | Linus Walleij <[email protected]> | 2013-12-09 13:04:37 +0000 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2013-12-09 13:04:37 +0000 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /drivers/spi/spi.c | |
| parent | Merge branch 'mark-irqs' into devel (diff) | |
| parent | Linux 3.13-rc3 (diff) | |
| download | kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.tar.gz kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.zip | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'drivers/spi/spi.c')
| -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 { |