diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | fa93e4fb602389c5a5d6991a86cf93ae6e92d016 (patch) | |
| tree | 570dc8a12e7410fb1f87ddb473ad5a5e64240846 /common | |
| parent | 52a0febb3dbe06e233f04d5c670fd662b85c1d95 (diff) | |
| parent | d5a82eb095def58f3a19127bb08ff96d799b63a5 (diff) | |
| download | barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.gz barebox-fa93e4fb602389c5a5d6991a86cf93ae6e92d016.tar.xz | |
Merge branch 'for-next/resource-err-ptr'
Diffstat (limited to 'common')
| -rw-r--r-- | common/memory.c | 7 | ||||
| -rw-r--r-- | common/resource.c | 15 |
2 files changed, 15 insertions, 7 deletions
diff --git a/common/memory.c b/common/memory.c index 4a8fe283f2..57c73abb22 100644 --- a/common/memory.c +++ b/common/memory.c @@ -22,6 +22,7 @@ #include <of.h> #include <init.h> #include <linux/ioport.h> +#include <linux/err.h> #include <asm-generic/memory_layout.h> #include <asm/sections.h> #include <malloc.h> @@ -123,8 +124,8 @@ int barebox_add_memory_bank(const char *name, resource_size_t start, struct device_d *dev; bank->res = request_iomem_region(name, start, start + size - 1); - if (!bank->res) - return -EBUSY; + if (IS_ERR(bank->res)) + return PTR_ERR(bank->res); dev = add_mem_device(name, start, size, IORESOURCE_MEM_WRITEABLE); @@ -150,7 +151,7 @@ struct resource *request_sdram_region(const char *name, resource_size_t start, res = __request_region(bank->res, name, start, start + size - 1); - if (res) + if (!IS_ERR(res)) return res; } diff --git a/common/resource.c b/common/resource.c index fe4680e3bd..e4bbe15fd7 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: @@ -141,5 +142,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 ERR_CAST(res); + + return res; } |