summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 10:38:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:10 +0200
commited6e965824303255cacc1c1a195d3684caa26bce (patch)
tree26e2b1b78498675ceae4dd2e990836c26ec1d5ec /arch/arm/mach-tegra
parent5bdc82c54a3306f2ae151a00f2df54f9240395b8 (diff)
downloadbarebox-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-tegra')
-rw-r--r--arch/arm/mach-tegra/tegra20-pmc.c5
-rw-r--r--arch/arm/mach-tegra/tegra20-timer.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/tegra20-pmc.c b/arch/arm/mach-tegra/tegra20-pmc.c
index 94167d68fc..d86809432e 100644
--- a/arch/arm/mach-tegra/tegra20-pmc.c
+++ b/arch/arm/mach-tegra/tegra20-pmc.c
@@ -23,6 +23,7 @@
#include <command.h>
#include <init.h>
#include <io.h>
+#include <linux/err.h>
#include <mach/tegra20-pmc.h>
@@ -40,9 +41,9 @@ EXPORT_SYMBOL(reset_cpu);
static int tegra20_pmc_probe(struct device_d *dev)
{
pmc_base = dev_request_mem_region(dev, 0);
- if (!pmc_base) {
+ if (IS_ERR(pmc_base)) {
dev_err(dev, "could not get memory region\n");
- return -ENODEV;
+ return PTR_ERR(pmc_base);
}
return 0;
diff --git a/arch/arm/mach-tegra/tegra20-timer.c b/arch/arm/mach-tegra/tegra20-timer.c
index 2b3264794c..ddc70dc8dd 100644
--- a/arch/arm/mach-tegra/tegra20-timer.c
+++ b/arch/arm/mach-tegra/tegra20-timer.c
@@ -24,6 +24,7 @@
#include <init.h>
#include <io.h>
#include <linux/clk.h>
+#include <linux/err.h>
#include <mach/lowlevel.h>
/* register definitions */
@@ -51,9 +52,9 @@ static int tegra20_timer_probe(struct device_d *dev)
return -EBUSY;
timer_base = dev_request_mem_region(dev, 0);
- if (!timer_base) {
+ if (IS_ERR(timer_base)) {
dev_err(dev, "could not get memory region\n");
- return -ENODEV;
+ return PTR_ERR(timer_base);
}
/*