summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 10:38:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:10 +0200
commited6e965824303255cacc1c1a195d3684caa26bce (patch)
tree26e2b1b78498675ceae4dd2e990836c26ec1d5ec /drivers/spi
parent5bdc82c54a3306f2ae151a00f2df54f9240395b8 (diff)
downloadbarebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.gz
barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.xz
resource: Let dev_request_mem_region return an error pointer
For all users fix or add the error check. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/altera_spi.c3
-rw-r--r--drivers/spi/mvebu_spi.c4
-rw-r--r--drivers/spi/mxs_spi.c3
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index 983b877e87..bf1add81fe 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -222,6 +222,9 @@ static int altera_spi_probe(struct device_d *dev)
master->bus_num = pdata->bus_num;
altera_spi->regs = dev_request_mem_region(dev, 0);
+ if (IS_ERR(altera_spi->regs))
+ return PTR_ERR(altera_spi->regs);
+
altera_spi->databits = pdata->databits;
altera_spi->speed = pdata->speed;
altera_spi->mode = pdata->spi_mode;
diff --git a/drivers/spi/mvebu_spi.c b/drivers/spi/mvebu_spi.c
index 4a6d96f978..c2a2e5094d 100644
--- a/drivers/spi/mvebu_spi.c
+++ b/drivers/spi/mvebu_spi.c
@@ -343,8 +343,8 @@ static int mvebu_spi_probe(struct device_d *dev)
priv = xzalloc(sizeof(*priv));
priv->base = dev_request_mem_region(dev, 0);
- if (!priv->base) {
- ret = -EINVAL;
+ if (IS_ERR(priv->base)) {
+ ret = PTR_ERR(priv->base);
goto err_free;
}
priv->set_baudrate = (void *)match->data;
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index a00784f55b..9a35e09b88 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -267,6 +267,9 @@ static int mxs_spi_probe(struct device_d *dev)
mxs->mode = SPI_CPOL | SPI_CPHA;
mxs->regs = dev_request_mem_region(dev, 0);
+ if (IS_ERR(mxs->regs))
+ return PTR_ERR(mxs->regs);
+
mxs->clk = clk_get(dev, NULL);
if (IS_ERR(mxs->clk))
return PTR_ERR(mxs->clk);