summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/imx-weim.c5
-rw-r--r--drivers/bus/omap-gpmc.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c
index 78bccda15a..9b8848d0ad 100644
--- a/drivers/bus/imx-weim.c
+++ b/drivers/bus/imx-weim.c
@@ -12,6 +12,7 @@
#include <init.h>
#include <io.h>
#include <of.h>
+#include <linux/err.h>
struct imx_weim_devtype {
unsigned int cs_count;
@@ -144,8 +145,8 @@ static int weim_probe(struct device_d *dev)
/* get the resource */
weim->base = dev_request_mem_region(dev, 0);
- if (!weim->base) {
- ret = -EBUSY;
+ if (IS_ERR(weim->base)) {
+ ret = PTR_ERR(weim->base);
goto weim_err;
}
diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c
index d7b02cf6ec..6cc3269993 100644
--- a/drivers/bus/omap-gpmc.c
+++ b/drivers/bus/omap-gpmc.c
@@ -17,6 +17,7 @@
#include <of_address.h>
#include <of_mtd.h>
#include <linux/clk.h>
+#include <linux/err.h>
#include <mach/gpmc_nand.h>
#include <mach/gpmc.h>
@@ -404,8 +405,8 @@ static int gpmc_probe_nand_child(struct device_d *dev,
}
gpmc_base = dev_get_mem_region(dev, 0);
- if (!gpmc_base)
- return -ENODEV;
+ if (IS_ERR(gpmc_base))
+ return PTR_ERR(gpmc_base);
gpmc_nand_data.cs = val;
gpmc_nand_data.of_node = child;