Merge MTD updates into -next

ed446cc7 · Brian Norris · 24542257 · e423c90a · ed446cc7
Commit ed446cc7 authored Feb 28, 2015 by Brian Norris
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/mtd/nand/pxa3xx_nand.c drivers/mtd/nand/pxa3xx_nand.c +2 -0

No files found.
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1622,6 +1622,8 @@ static int alloc_nand_resource(struct platform_device *pdev)
 	int ret, irq, cs;
 	pdata = dev_get_platdata(&pdev->dev);
+	if (pdata->num_cs <= 0)
+		return -ENODEV;
 	info = devm_kzalloc(&pdev->dev, sizeof(*info) + (sizeof(*mtd) +
 			    sizeof(*host)) * pdata->num_cs, GFP_KERNEL);
 	if (!info)