diff options
| author | Ivan Khoronzhuk | 2013-12-17 14:36:05 +0100 |
|---|---|---|
| committer | Brian Norris | 2014-01-03 20:22:24 +0100 |
| commit | f735a4d0d5b76c6035f30749c4e0aa64b3a9a74e (patch) | |
| tree | 76672d02b64d196a0879954d5fd5162fc853723d /drivers/mtd/nand/davinci_nand.c | |
| parent | mtd: nand: davinci: fix driver registration (diff) | |
| download | kernel-qcow2-linux-f735a4d0d5b76c6035f30749c4e0aa64b3a9a74e.tar.gz kernel-qcow2-linux-f735a4d0d5b76c6035f30749c4e0aa64b3a9a74e.tar.xz kernel-qcow2-linux-f735a4d0d5b76c6035f30749c4e0aa64b3a9a74e.zip | |
mtd: nand: davinci: return ENOMEM if memory allocation is failed
In case when memory allocation is failed the driver should return
ENOMEM instead of ENODEV.
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Taras Kondratiuk <taras@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand/davinci_nand.c')
| -rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 584c1f4b6fce..4577fb41c0c7 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -541,7 +541,7 @@ 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; @@ -598,6 +598,9 @@ static int 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; |