1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 876dfab92847..58207b3b9411 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -29,7 +29,6 @@ struct physmap_flash_info {
         struct map_info         map[MAX_RESOURCES];
 #ifdef CONFIG_MTD_PARTITIONS
         int                     nr_parts;
-        struct mtd_partition    *parts;
 #endif
 };
 
@@ -56,14 +55,10 @@ static int physmap_flash_remove(struct platform_device *dev)
         for (i = 0; i < MAX_RESOURCES; i++) {
                 if (info->mtd[i] != NULL) {
 #ifdef CONFIG_MTD_PARTITIONS
-                        if (info->nr_parts) {
+                        if (info->nr_parts || physmap_data->nr_parts)
                                 del_mtd_partitions(info->mtd[i]);
-                                kfree(info->parts);
-                        } else if (physmap_data->nr_parts) {
-                                del_mtd_partitions(info->mtd[i]);
-                        } else {
+                        else
                                 del_mtd_device(info->mtd[i]);
-                        }
 #else
                         del_mtd_device(info->mtd[i]);
 #endif
@@ -86,6 +81,9 @@ static int physmap_flash_probe(struct platform_device *dev)
         int err = 0;
         int i;
         int devices_found = 0;
+#ifdef CONFIG_MTD_PARTITIONS
+        struct mtd_partition *parts;
+#endif
 
         physmap_data = dev->dev.platform_data;
         if (physmap_data == NULL)
@@ -163,9 +161,10 @@ static int physmap_flash_probe(struct platform_device *dev)
                 goto err_out;
 
 #ifdef CONFIG_MTD_PARTITIONS
-        err = parse_mtd_partitions(info->cmtd, part_probe_types, &info->parts, 0);
+        err = parse_mtd_partitions(info->cmtd, part_probe_types, &parts, 0);
         if (err > 0) {
-                add_mtd_partitions(info->cmtd, info->parts, err);
+                add_mtd_partitions(info->cmtd, parts, err);
+                kfree(parts);
                 return 0;
         }