mtd: physmap_of: Fix resources leak in 'of_flash_probe()'

[linux-2.6-microblaze.git] / drivers / mtd / maps / physmap_of_core.c

diff --git a/drivers/mtd/maps/physmap_of_core.c b/drivers/mtd/maps/physmap_of_core.c
index 62fa683..b1bd4fa 100644 (file)
--- a/drivers/mtd/maps/physmap_of_core.c
+++ b/drivers/mtd/maps/physmap_of_core.c
@@ -178,8 +178,8 @@ static int of_flash_probe(struct platform_device *dev)
         */
        p = of_get_property(dp, "reg", &count);
        if (!p || count % reg_tuple_size != 0) {
-               dev_err(&dev->dev, "Malformed reg property on %s\n",
-                               dev->dev.of_node->full_name);
+               dev_err(&dev->dev, "Malformed reg property on %pOF\n",
+                               dev->dev.of_node);
                err = -EINVAL;
                goto err_flash_remove;
        }
@@ -235,10 +235,10 @@ static int of_flash_probe(struct platform_device *dev)
 
                err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
                if (err)
-                       return err;
+                       goto err_out;
                err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
                if (err)
-                       return err;
+                       goto err_out;
 
                err = -ENOMEM;
                info->list[i].map.virt = ioremap(info->list[i].map.phys,