From 9d518ba397712add7fa06ff3ab056a26a3c46de6 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 31 Jul 2014 08:47:48 +0200 Subject: resource: Let dev_get_resource return an error pointer Signed-off-by: Sascha Hauer --- drivers/base/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/base') 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); -- cgit v1.2.3