diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-06-02 00:06:23 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-05 13:35:44 -0400 |
| commit | 4938c88c922fad23f0a9f404eeda0207a819e4df (patch) | |
| tree | f4ba97c4721f421fb172e8ce237da846c4928a18 | |
| parent | 9f31f4b9dccf6fa4a606ae04602ec232b94727fb (diff) | |
mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | drivers/mtd/maps/bfin-async-flash.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 576611f605db..365c77b1b871 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c | |||
| @@ -40,6 +40,9 @@ struct async_state { | |||
| 40 | uint32_t flash_ambctl0, flash_ambctl1; | 40 | uint32_t flash_ambctl0, flash_ambctl1; |
| 41 | uint32_t save_ambctl0, save_ambctl1; | 41 | uint32_t save_ambctl0, save_ambctl1; |
| 42 | unsigned long irq_flags; | 42 | unsigned long irq_flags; |
| 43 | #ifdef CONFIG_MTD_PARTITIONS | ||
| 44 | struct mtd_partition *parts; | ||
| 45 | #endif | ||
| 43 | }; | 46 | }; |
| 44 | 47 | ||
| 45 | static void switch_to_flash(struct async_state *state) | 48 | static void switch_to_flash(struct async_state *state) |
| @@ -170,6 +173,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) | |||
| 170 | if (ret > 0) { | 173 | if (ret > 0) { |
| 171 | pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n"); | 174 | pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n"); |
| 172 | add_mtd_partitions(state->mtd, pdata->parts, ret); | 175 | add_mtd_partitions(state->mtd, pdata->parts, ret); |
| 176 | state->parts = pdata->parts; | ||
| 173 | 177 | ||
| 174 | } else if (pdata->nr_parts) { | 178 | } else if (pdata->nr_parts) { |
| 175 | pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n"); | 179 | pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n"); |
| @@ -193,6 +197,7 @@ static int __devexit bfin_flash_remove(struct platform_device *pdev) | |||
| 193 | gpio_free(state->enet_flash_pin); | 197 | gpio_free(state->enet_flash_pin); |
| 194 | #ifdef CONFIG_MTD_PARTITIONS | 198 | #ifdef CONFIG_MTD_PARTITIONS |
| 195 | del_mtd_partitions(state->mtd); | 199 | del_mtd_partitions(state->mtd); |
| 200 | kfree(state->parts); | ||
| 196 | #endif | 201 | #endif |
| 197 | map_destroy(state->mtd); | 202 | map_destroy(state->mtd); |
| 198 | kfree(state); | 203 | kfree(state); |
