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 /arch/arm/mach-at91 | |
| 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 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91sam926x_time.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/sam9_smc.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c index 644dc34766..06d3e3276e 100644 --- a/arch/arm/mach-at91/at91sam926x_time.c +++ b/arch/arm/mach-at91/at91sam926x_time.c @@ -90,6 +90,8 @@ static int at91_pit_probe(struct device_d *dev) } pit_base = dev_request_mem_region(dev, 0); + if (IS_ERR(pit_base)) + return PTR_ERR(pit_base); pit_rate = clk_get_rate(clk) / 16; diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c index 60c067dbc6..6346bb440c 100644 --- a/arch/arm/mach-at91/sam9_smc.c +++ b/arch/arm/mach-at91/sam9_smc.c @@ -14,6 +14,7 @@ #include <mach/hardware.h> #include <mach/cpu.h> #include <mach/io.h> +#include <linux/err.h> #include <mach/at91sam9_smc.h> @@ -182,9 +183,9 @@ static int at91sam9_smc_probe(struct device_d *dev) } smc_base_addr[id] = dev_request_mem_region(dev, 0); - if (!smc_base_addr[id]) { + if (IS_ERR(smc_base_addr[id])) { dev_err(dev, "Impossible to request smc.%d\n", id); - return -ENOMEM; + return PTR_ERR(smc_base_addr[id]); } return 0; |