diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-31 10:38:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-16 08:32:10 +0200 |
| commit | ed6e965824303255cacc1c1a195d3684caa26bce (patch) | |
| tree | 26e2b1b78498675ceae4dd2e990836c26ec1d5ec /arch/arm/mach-at91 | |
| parent | 5bdc82c54a3306f2ae151a00f2df54f9240395b8 (diff) | |
| download | barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.gz barebox-ed6e965824303255cacc1c1a195d3684caa26bce.tar.xz | |
resource: Let dev_request_mem_region return an error pointer
For all users fix or add the error check.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 9f028079c2..403fa9b1c4 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> @@ -164,9 +165,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; |