summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 08:47:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:09 +0200
commit9d518ba397712add7fa06ff3ab056a26a3c46de6 (patch)
treeda8fbe4537c39f433b6868b7733bbc2e34250378 /drivers/base
parentdde56d42ad1763dd81a3de65b74d7387d12f6fa9 (diff)
downloadbarebox-9d518ba397712add7fa06ff3ab056a26a3c46de6.tar.gz
barebox-9d518ba397712add7fa06ff3ab056a26a3c46de6.tar.xz
resource: Let dev_get_resource return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index d90da4227a..524ed1c980 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -256,7 +256,7 @@ struct resource *dev_get_resource(struct device_d *dev, unsigned long type,
}
}
- return NULL;
+ return ERR_PTR(-ENOENT);
}
void *dev_get_mem_region(struct device_d *dev, int num)
@@ -264,7 +264,7 @@ void *dev_get_mem_region(struct device_d *dev, int num)
struct resource *res;
res = dev_get_resource(dev, IORESOURCE_MEM, num);
- if (!res)
+ if (IS_ERR(res))
return NULL;
return (void __force *)res->start;
@@ -323,7 +323,7 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
struct resource *res;
res = dev_get_resource(dev, IORESOURCE_MEM, num);
- if (!res)
+ if (IS_ERR(res))
return NULL;
res = request_iomem_region(dev_name(dev), res->start, res->end);