Commit ad4fbc79 authored by vimal singh's avatar vimal singh Committed by David Woodhouse

mtd: physmap_of: fix incorrect check

This patch fixes a spelling error that has resulted from copy and
pasting. The location of the error was found using a semantic patch
but the semantic patch was not trying to find these errors. After
looking things over it seemed logical that this change was needed.

The patch also makes sure mtd_list is not being freed if it has not
been allocated
Signed-off-by: default avatarStoyan Gaydarov <sgayda2@uiuc.edu>
Signed-off-by: default avatarVimal Singh <vimalsingh@ti.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 9a73290d
...@@ -205,7 +205,7 @@ static int __devinit of_flash_probe(struct of_device *dev, ...@@ -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_err(&dev->dev, "Malformed reg property on %s\n",
dev->node->full_name); dev->node->full_name);
err = -EINVAL; err = -EINVAL;
goto err_out; goto err_flash_remove;
} }
count /= reg_tuple_size; count /= reg_tuple_size;
...@@ -213,14 +213,14 @@ static int __devinit of_flash_probe(struct of_device *dev, ...@@ -213,14 +213,14 @@ static int __devinit of_flash_probe(struct of_device *dev,
info = kzalloc(sizeof(struct of_flash) + info = kzalloc(sizeof(struct of_flash) +
sizeof(struct of_flash_list) * count, GFP_KERNEL); sizeof(struct of_flash_list) * count, GFP_KERNEL);
if (!info) if (!info)
goto err_out; goto err_flash_remove;
mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
if (!info)
goto err_out;
dev_set_drvdata(&dev->dev, info); 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++) { for (i = 0; i < count; i++) {
err = -ENXIO; err = -ENXIO;
if (of_address_to_resource(dp, i, &res)) { if (of_address_to_resource(dp, i, &res)) {
...@@ -339,6 +339,7 @@ static int __devinit of_flash_probe(struct of_device *dev, ...@@ -339,6 +339,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
err_out: err_out:
kfree(mtd_list); kfree(mtd_list);
err_flash_remove:
of_flash_remove(dev); of_flash_remove(dev);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment