diff options
| author | Ingo Molnar | 2009-03-01 12:47:58 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-01 12:47:58 +0100 |
| commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /drivers/mtd/maps/bfin-async-flash.c | |
| parent | Revert "gpu/drm, x86, PAT: PAT support for io_mapping_*" (diff) | |
| parent | x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() (diff) | |
| download | kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.gz kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.xz kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.zip | |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'drivers/mtd/maps/bfin-async-flash.c')
| -rw-r--r-- | drivers/mtd/maps/bfin-async-flash.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 6fec86aaed7e..576611f605db 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c @@ -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); |