UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ivan Khoronzhuk 2013-12-17 15:36:05 +02:00 committed by Brian Norris
parent eaaa4a9af3
commit f735a4d0d5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mtd/nand/davinci_nand.c
View File

@ -541,7 +541,7 @@ static struct davinci_nand_pdata
GFP_KERNEL); GFP_KERNEL);
pdev->dev.platform_data = pdata; pdev->dev.platform_data = pdata;
if (!pdata) if (!pdata)
return NULL; return ERR_PTR(-ENOMEM);
if (!of_property_read_u32(pdev->dev.of_node, if (!of_property_read_u32(pdev->dev.of_node,
"ti,davinci-chipselect", &prop)) "ti,davinci-chipselect", &prop))
pdev->id = prop; pdev->id = prop;
@ -598,6 +598,9 @@ static int nand_davinci_probe(struct platform_device *pdev)
nand_ecc_modes_t ecc_mode; nand_ecc_modes_t ecc_mode;
pdata = nand_davinci_get_pdata(pdev); pdata = nand_davinci_get_pdata(pdev);
if (IS_ERR(pdata))
return PTR_ERR(pdata);
/* insist on board-specific configuration */ /* insist on board-specific configuration */
if (!pdata) if (!pdata)
return -ENODEV; return -ENODEV;