korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2013-11-28 11:31:35 +00:00
commit b8aba7611b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi.c
View File

@ -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 {