]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[MTD] [MAPS] blackfin: fix memory leak in error path
authorMike Frysinger <vapier.adi@gmail.com>
Wed, 11 Feb 2009 21:12:18 +0000 (13:12 -0800)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 14 Feb 2009 08:07:05 +0000 (08:07 +0000)
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/mtd/maps/bfin-async-flash.c

index 6fec86aaed7ebd0100e9d921e4e01bc37806a047..576611f605db1df5063775a677d3cc499cb010e7 100644 (file)
@@ -152,14 +152,18 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
 
        if (gpio_request(state->enet_flash_pin, DRIVER_NAME)) {
                pr_devinit(KERN_ERR DRIVER_NAME ": Failed to request gpio %d\n", state->enet_flash_pin);
+               kfree(state);
                return -EBUSY;
        }
        gpio_direction_output(state->enet_flash_pin, 1);
 
        pr_devinit(KERN_NOTICE DRIVER_NAME ": probing %d-bit flash bus\n", state->map.bankwidth * 8);
        state->mtd = do_map_probe(memory->name, &state->map);
-       if (!state->mtd)
+       if (!state->mtd) {
+               gpio_free(state->enet_flash_pin);
+               kfree(state);
                return -ENXIO;
+       }
 
 #ifdef CONFIG_MTD_PARTITIONS
        ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);