summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 09:07:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:10 +0200
commit5bdc82c54a3306f2ae151a00f2df54f9240395b8 (patch)
treeb20a41ad645090b15bda9a89faffc718e0d3a833 /drivers/base
parent29b7f95f3bd244a4b4d036e1b3a94a7bfbe3581c (diff)
downloadbarebox-5bdc82c54a3306f2ae151a00f2df54f9240395b8.tar.gz
barebox-5bdc82c54a3306f2ae151a00f2df54f9240395b8.tar.xz
resource: Let dev_request_mem_region_by_name return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 23f31ce77e..e61c6c57ca 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -308,11 +308,11 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n
res = dev_get_resource_by_name(dev, IORESOURCE_MEM, name);
if (IS_ERR(res))
- return NULL;
+ return ERR_CAST(res);
res = request_iomem_region(dev_name(dev), res->start, res->end);
if (IS_ERR(res))
- return NULL;
+ return ERR_CAST(res);
return (void __force __iomem *)res->start;
}