summaryrefslogtreecommitdiffstats
path: root/common/resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/resource.c')
-rw-r--r--common/resource.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/common/resource.c b/common/resource.c
index fe4680e..6e84bd8 100644
--- a/common/resource.c
+++ b/common/resource.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <init.h>
#include <linux/ioport.h>
+#include <linux/err.h>
#include <asm/io.h>
static int init_resource(struct resource *res, const char *name)
@@ -48,7 +49,7 @@ struct resource *__request_region(struct resource *parent,
__func__,
(unsigned long long)start,
(unsigned long long)end);
- return NULL;
+ return ERR_PTR(-EINVAL);
}
/* outside parent resource? */
@@ -59,7 +60,7 @@ struct resource *__request_region(struct resource *parent,
(unsigned long long)end,
(unsigned long long)parent->start,
(unsigned long long)parent->end);
- return NULL;
+ return ERR_PTR(-EINVAL);
}
/*
@@ -77,7 +78,7 @@ struct resource *__request_region(struct resource *parent,
(unsigned long long)end,
(unsigned long long)r->start,
(unsigned long long)r->end);
- return NULL;
+ return ERR_PTR(-EBUSY);
}
ok:
@@ -124,7 +125,13 @@ struct resource iomem_resource = {
struct resource *request_iomem_region(const char *name,
resource_size_t start, resource_size_t end)
{
- return __request_region(&iomem_resource, name, start, end);
+ struct resource *res;
+
+ res = __request_region(&iomem_resource, name, start, end);
+ if (IS_ERR(res))
+ return NULL;
+
+ return res;
}
/* The root resource for the whole io-mapped io space */
@@ -141,5 +148,11 @@ struct resource ioport_resource = {
struct resource *request_ioport_region(const char *name,
resource_size_t start, resource_size_t end)
{
- return __request_region(&ioport_resource, name, start, end);
+ struct resource *res;
+
+ res = __request_region(&ioport_resource, name, start, end);
+ if (IS_ERR(res))
+ return NULL;
+
+ return res;
}