summaryrefslogtreecommitdiffstats
path: root/drivers/net/ar231x.c
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/net/ar231x.c
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/net/ar231x.c')
-rw-r--r--drivers/net/ar231x.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ar231x.c b/drivers/net/ar231x.c
index 572008a831..48e4b30fd6 100644
--- a/drivers/net/ar231x.c
+++ b/drivers/net/ar231x.c
@@ -26,6 +26,7 @@
#include <net.h>
#include <init.h>
#include <io.h>
+#include <linux/err.h>
#include "ar231x.h"
@@ -384,18 +385,18 @@ static int ar231x_eth_probe(struct device_d *dev)
priv->reset_bit = pdata->reset_bit;
priv->eth_regs = dev_request_mem_region(dev, 0);
- if (priv->eth_regs == NULL) {
+ if (IS_ERR(priv->eth_regs)) {
dev_err(dev, "No eth_regs!!\n");
- return -ENODEV;
+ return PTR_ERR(priv->eth_regs);
}
/* we have 0x100000 for eth, part of it are dma regs.
* So they are already requested */
priv->dma_regs = (void *)(priv->eth_regs + 0x1000);
priv->phy_regs = dev_request_mem_region(dev, 1);
- if (priv->phy_regs == NULL) {
+ if (IS_ERR(priv->phy_regs)) {
dev_err(dev, "No phy_regs!!\n");
- return -ENODEV;
+ return PTR_ERR(priv->phy_regs);
}
priv->cfg = pdata;