summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/nomadik_nand.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 09:07:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:10 +0200
commit5bdc82c54a3306f2ae151a00f2df54f9240395b8 (patch)
treeb20a41ad645090b15bda9a89faffc718e0d3a833 /drivers/mtd/nand/nomadik_nand.c
parent29b7f95f3bd244a4b4d036e1b3a94a7bfbe3581c (diff)
downloadbarebox-5bdc82c54a3306f2ae151a00f2df54f9240395b8.tar.gz
barebox-5bdc82c54a3306f2ae151a00f2df54f9240395b8.tar.xz
resource: Let dev_request_mem_region_by_name return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nand/nomadik_nand.c')
-rw-r--r--drivers/mtd/nand/nomadik_nand.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index fbd8ecd487..8f37345bce 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -26,6 +26,7 @@
#include <malloc.h>
#include <init.h>
+#include <linux/err.h>
#include <linux/types.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/nand.h>
@@ -190,7 +191,11 @@ static int nomadik_nand_probe(struct device_d *dev)
}
host->cmd_va = dev_request_mem_region_by_name(dev, "nand_cmd");
+ if (IS_ERR(host->cmd_va))
+ return PTR_ERR(host->cmd_va);
host->addr_va = dev_request_mem_region_by_name(dev, "nand_addr");
+ if (IS_ERR(host->addr_va))
+ return PTR_ERR(host->addr_va);
/* Link all private pointers */
mtd = &host->mtd;
@@ -200,6 +205,8 @@ static int nomadik_nand_probe(struct device_d *dev)
mtd->parent = dev;
nand->IO_ADDR_W = nand->IO_ADDR_R = dev_request_mem_region_by_name(dev, "nand_data");
+ if (IS_ERR(nand->IO_ADDR_W))
+ return PTR_ERR(nand->IO_ADDR_W);
nand->cmd_ctrl = nomadik_cmd_ctrl;
nand->ecc.mode = NAND_ECC_HW;