Patchwork [mtd] fixed faulty check

login
register
mail settings
Submitter Stoyan Gaydarov
Date July 30, 2009, 2:47 p.m.
Message ID <1248965243-861-1-git-send-email-sgayda2@uiuc.edu>
Download mbox | patch
Permalink /patch/30387/
State New, archived
Headers show

Comments

Stoyan Gaydarov - July 30, 2009, 2:47 p.m.
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: Stoyan Gaydarov <sgayda2@uiuc.edu>
---
 drivers/mtd/maps/physmap_of.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
vimal singh - July 30, 2009, 3:07 p.m.
On Thu, Jul 30, 2009 at 8:17 PM, Stoyan Gaydarov<sgayda2@uiuc.edu> wrote:
> 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: Stoyan Gaydarov <sgayda2@uiuc.edu>
> ---
>  drivers/mtd/maps/physmap_of.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
> index 39d357b..96a1c50 100644
> --- a/drivers/mtd/maps/physmap_of.c
> +++ b/drivers/mtd/maps/physmap_of.c
> @@ -215,8 +215,8 @@ static int __devinit of_flash_probe(struct of_device *dev,
>                goto err_out;
>
>        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
> -       if (!info)
> -               goto err_out;
> +       if (!mtd_list)
> +               goto err_out_no_free;

There are two more errors before this due to which you may jump to 'err_out'.

Correct goto labels for those also. And can please change the label
name, its confusing as of now. Perhaps to 'err_flash_remove'.

>
>        dev_set_drvdata(&dev->dev, info);
>
> @@ -338,6 +338,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
>
>  err_out:
>        kfree(mtd_list);
> +err_out_no_free:
>        of_flash_remove(dev);
>
>        return err;
> --
> 1.6.3.3
>
>

Patch

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 39d357b..96a1c50 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -215,8 +215,8 @@  static int __devinit of_flash_probe(struct of_device *dev,
 		goto err_out;
 
 	mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
-	if (!info)
-		goto err_out;
+	if (!mtd_list)
+		goto err_out_no_free;
 
 	dev_set_drvdata(&dev->dev, info);
 
@@ -338,6 +338,7 @@  static int __devinit of_flash_probe(struct of_device *dev,
 
 err_out:
 	kfree(mtd_list);
+err_out_no_free:
 	of_flash_remove(dev);
 
 	return err;