Hi, > > This simplifies the error path and makes the code less error-prone. > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx> > --- > drivers/mtd/nand/omap2.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > index e01a936..d3155b2 100644 > --- a/drivers/mtd/nand/omap2.c > +++ b/drivers/mtd/nand/omap2.c > @@ -1837,7 +1837,7 @@ static int omap_nand_probe(struct > platform_device *pdev) > return -ENODEV; > } > > - info = kzalloc(sizeof(struct omap_nand_info), GFP_KERNEL); > + info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL); > if (!info) > return -ENOMEM; > > @@ -2067,8 +2067,6 @@ out_release_mem_region: > free_irq(info->gpmc_irq_fifo, info); > release_mem_region(info->phys_base, info->mem_size); > out_free_info: > - kfree(info); > - > return err; > } > > @@ -2091,7 +2089,6 @@ static int omap_nand_remove(struct > platform_device *pdev) > nand_release(&info->mtd); > iounmap(info->nand.IO_ADDR_R); > release_mem_region(info->phys_base, info->mem_size); > - kfree(info); > return 0; > } > > -- > 1.8.1.5 I think these changes are already done as part of following patch.. http://lists.infradead.org/pipermail/linux-mtd/2013-October/049418.html Did your rebase on my patch-set ? with regards, pekon -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
