[PATCH] drivers/mtd/nand/bcm_umi_nand.c: add missing kfree/ioremap

Julia Lawall julia at diku.dk
Wed Aug 10 02:11:56 EDT 2011


On Wed, 10 Aug 2011, Ryan Mallon wrote:

> On 10/08/11 15:42, Julia Lawall wrote:
> > From: Julia Lawall<julia at diku.dk>
> >
> > The error handling code under the #if should be the same as elsewhere in
> > the function.
> >
> > Signed-off-by: Julia Lawall<julia at diku.dk>
> >
> > ---
> >   drivers/mtd/nand/bcm_umi_nand.c |    5 ++++-
> >   1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/mtd/nand/bcm_umi_nand.c
> > b/drivers/mtd/nand/bcm_umi_nand.c
> > index a8ae898..72e8ec2 100644
> > --- a/drivers/mtd/nand/bcm_umi_nand.c
> > +++ b/drivers/mtd/nand/bcm_umi_nand.c
> > @@ -433,8 +433,11 @@ static int __devinit bcm_umi_nand_probe(struct
> platform_device *pdev)
> >
> >   #if USE_DMA
> >   	err = nand_dma_init();
> > -	if (err != 0)
> > +	if (err != 0) {
> > +		iounmap(bcm_umi_io_base);
> > +		kfree(board_mtd);
> >   		return err;
> > +	}
> >   #endif
> 
> This probe function should possibly use goto exits on failure. It reduces a
> bit of code duplication and helps prevent this type of error.

OK, I didn't want to make such a major change for only one new case.  But 
since there are three new cases, I will do that.

julia



More information about the linux-mtd mailing list