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-tegra | |
| 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-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/tegra20-pmc.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra20-timer.c | 5 |
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); } /* |