[PATCH 02/12] mtd: nand: davinci: check required ti,davinci-chipselect property
Khoronzhuk, Ivan
ivan.khoronzhuk at ti.com
Mon Nov 11 11:53:17 EST 2013
The property "ti,davinci-chipselect" is required. So we have to check
if it is set.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk at ti.com>
---
drivers/mtd/nand/davinci_nand.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index d87213f..8e1c88e 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -541,10 +541,14 @@ static struct davinci_nand_pdata
GFP_KERNEL);
pdev->dev.platform_data = pdata;
if (!pdata)
- return NULL;
+ return ERR_PTR(-ENOMEM);
+
if (!of_property_read_u32(pdev->dev.of_node,
"ti,davinci-chipselect", &prop))
pdev->id = prop;
+ else
+ return ERR_PTR(-EINVAL);
+
if (!of_property_read_u32(pdev->dev.of_node,
"ti,davinci-mask-ale", &prop))
pdata->mask_ale = prop;
@@ -598,6 +602,10 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
nand_ecc_modes_t ecc_mode;
pdata = nand_davinci_get_pdata(pdev);
+ if (IS_ERR(pdata)) {
+ return PTR_ERR(pdata);
+ }
+
/* insist on board-specific configuration */
if (!pdata)
return -ENODEV;
--
1.7.9.5
More information about the linux-arm-kernel
mailing list