Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed446cc7 authored by Brian Norris's avatar Brian Norris
Browse files

Merge MTD updates into -next

parents 24542257 e423c90a
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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)