summaryrefslogtreecommitdiffstats
path: root/drivers/base/driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/driver.c')
-rw-r--r--drivers/base/driver.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index e0125a1b92..81b35031a1 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -318,6 +318,22 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n
}
EXPORT_SYMBOL(dev_request_mem_region_by_name);
+void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num)
+{
+ struct resource *res;
+
+ res = dev_get_resource(dev, IORESOURCE_MEM, num);
+ if (IS_ERR(res))
+ return NULL;
+
+ res = request_iomem_region(dev_name(dev), res->start, res->end);
+ if (IS_ERR(res))
+ return NULL;
+
+ return (void __force __iomem *)res->start;
+}
+EXPORT_SYMBOL(dev_request_mem_region_err_null);
+
void __iomem *dev_request_mem_region(struct device_d *dev, int num)
{
struct resource *res;
@@ -330,7 +346,7 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num)
if (IS_ERR(res))
return ERR_CAST(res);
- return (void __force __iomem *)res->start;
+ return IOMEM(res->start);
}
EXPORT_SYMBOL(dev_request_mem_region);