From ed6e965824303255cacc1c1a195d3684caa26bce Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 31 Jul 2014 10:38:08 +0200 Subject: resource: Let dev_request_mem_region return an error pointer For all users fix or add the error check. Signed-off-by: Sascha Hauer --- drivers/net/ar231x.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'drivers/net/ar231x.c') 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 #include #include +#include #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; -- cgit v1.2.3