git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...
[pandora-kernel.git]
/
drivers
/
spi
/
spi-fsl-spi.c
diff --git
a/drivers/spi/spi-fsl-spi.c
b/drivers/spi/spi-fsl-spi.c
index
bbc9429
..
2129fcd
100644
(file)
--- a/
drivers/spi/spi-fsl-spi.c
+++ b/
drivers/spi/spi-fsl-spi.c
@@
-902,7
+902,7
@@
static int plat_mpc8xxx_spi_probe(struct platform_device *pdev)
return -EINVAL;
master = fsl_spi_probe(&pdev->dev, mem, irq);
- return PTR_
RET
(master);
+ return PTR_
ERR_OR_ZERO
(master);
}
static int plat_mpc8xxx_spi_remove(struct platform_device *pdev)