|
@@ -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;
|