mtd/maps: blackfin async flash maps - fix bug: dont leak resources when initializing in case of errors
PATCH 2/4 mtd/maps: blackfin async flash maps - fix bug: dont leak resources when initializing in case of errors
From: Mike Frysinger <[email protected]>
Signed-off-by Mike Frysinger <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
Cc David Woodhouse <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mtd/maps/bfin-async-flash.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mtd/maps/bfin-async-flash.c renamed from drivers/mtd/maps/bfin-async-flash.c~mtd-maps-blackfin-async-flash-maps-fix-bug-dont-leak-resources-when-initializing-in-case-of-errors +5 -1
@@ -152,14 +152,18 @@ static int __devinit bfin_flash_probe(stif (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 );
_