Commit f735a4d0 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by Brian Norris
Browse files

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: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarTaras Kondratiuk <taras@ti.com>
Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent eaaa4a9a

drivers/mtd/nand/davinci_nand.c

+4 −1
Original line number Diff line number Diff line
@@ -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;