Hi, On Fri, Oct 25, 2013 at 12:12 AM, Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx> wrote: > 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 | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > index e01a936..d4cafb0 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; > > @@ -2066,9 +2066,6 @@ out_release_mem_region: > if (info->gpmc_irq_fifo > 0) > free_irq(info->gpmc_irq_fifo, info); > release_mem_region(info->phys_base, info->mem_size); > -out_free_info: You remove ^^^^ statement but it's still used in line ~1868 as return when cannot get resource. > - kfree(info); > - > return err; > } > > @@ -2091,7 +2088,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 > > -- > 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 BR, marek -- as simple and primitive as possible ------------------------------------------------- Marek Belisko - OPEN-NANDRA Freelance Developer Ruska Nova Ves 219 | Presov, 08005 Slovak Republic Tel: +421 915 052 184 skype: marekwhite twitter: #opennandra web: http://open-nandra.com -- 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
