1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index f223f3fec3af..e828d58910f0 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -205,7 +205,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
                 dev_err(&dev->dev, "Malformed reg property on %s\n",
                                 dev->node->full_name);
                 err = -EINVAL;
-                goto err_out;
+                goto err_flash_remove;
         }
         count /= reg_tuple_size;
 
@@ -213,14 +213,14 @@ static int __devinit of_flash_probe(struct of_device *dev,
         info = kzalloc(sizeof(struct of_flash) +
                        sizeof(struct of_flash_list) * count, GFP_KERNEL);
         if (!info)
-                goto err_out;
-
-        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
-        if (!info)
-                goto err_out;
+                goto err_flash_remove;
 
         dev_set_drvdata(&dev->dev, info);
 
+        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
+        if (!mtd_list)
+                goto err_flash_remove;
+
         for (i = 0; i < count; i++) {
                 err = -ENXIO;
                 if (of_address_to_resource(dp, i, &res)) {
@@ -339,6 +339,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
 err_out:
         kfree(mtd_list);
+err_flash_remove:
         of_flash_remove(dev);
 
         return err;