projects
/
linux-drm-fsl-dcu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a19be58
)
Merge remote-tracking branch 'spi/fix/dspi' into spi-linus
author
Mark Brown
<broonie@linaro.org>
Mon, 7 Oct 2013 13:51:57 +0000
(14:51 +0100)
committer
Mark Brown
<broonie@linaro.org>
Mon, 7 Oct 2013 13:51:57 +0000
(14:51 +0100)
drivers/spi/spi-fsl-dspi.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-fsl-dspi.c
b/drivers/spi/spi-fsl-dspi.c
index 6cd07d13ecab3b5fc78c263cb6220a3b0ae4ddb5..4e44575bd87a9674c72338cafe25c1b5006ef529 100644
(file)
--- a/
drivers/spi/spi-fsl-dspi.c
+++ b/
drivers/spi/spi-fsl-dspi.c
@@
-476,15
+476,9
@@
static int dspi_probe(struct platform_device *pdev)
master->bus_num = bus_num;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res) {
- dev_err(&pdev->dev, "can't get platform resource\n");
- ret = -EINVAL;
- goto out_master_put;
- }
-
dspi->base = devm_ioremap_resource(&pdev->dev, res);
- if (
!dspi->base
) {
- ret =
-EINVAL
;
+ if (
IS_ERR(dspi->base)
) {
+ ret =
PTR_ERR(dspi->base)
;
goto out_master_put;
}