2011-06-01 17:10:25

by Julia Lawall

Subject: [PATCH 3/10] drivers/usb/host/ohci-pxa27x.c: add missing clk_put

From: Julia Lawall <[email protected]>

Add a label before the call to clk_put and jump to that in the error
handling code that occurs after the call to clk_get has succeeded.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression e1,e2;
statement S;
@@

e1 = clk_get@p1(...);
... when != e1 = e2
when != clk_put(e1)
when any
if (...) { ... when != clk_put(e1)
when != if (...) { ... clk_put(e1) ... }
* return@p3 ...;
} else S
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---
drivers/usb/host/ohci-pxa27x.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index afef7b0..80be547 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -312,8 +312,10 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
return PTR_ERR(usb_clk);

hcd = usb_create_hcd (driver, &pdev->dev, "pxa27x");
- if (!hcd)
- return -ENOMEM;
+ if (!hcd) {
+ retval = -ENOMEM;
+ goto err0;
+ }

r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) {
@@ -368,6 +370,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err1:
usb_put_hcd(hcd);
+ err0:
clk_put(usb_clk);
return retval;
}

2011-06-02 02:10:30

by Eric Miao

Subject: Re: [PATCH 3/10] drivers/usb/host/ohci-pxa27x.c: add missing clk_put

On Thu, Jun 2, 2011 at 1:10 AM, Julia Lawall <[email protected]> wrote:
> From: Julia Lawall <[email protected]>
>
> Add a label before the call to clk_put and jump to that in the error
> handling code that occurs after the call to clk_get has succeeded.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> expression e1,e2;
> statement S;
> @@
>
> e1 = clk_get@p1(...);
> ... when != e1 = e2
>    when != clk_put(e1)
>    when any
> if (...) { ... when != clk_put(e1)
>               when != if (...) { ... clk_put(e1) ... }
> * return@p3 ...;
>  } else S
> // </smpl>
>
> Signed-off-by: Julia Lawall <[email protected]>
>

Acked-by: Eric Miao <[email protected]>

> ---
>  drivers/usb/host/ohci-pxa27x.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
> index afef7b0..80be547 100644
> --- a/drivers/usb/host/ohci-pxa27x.c
> +++ b/drivers/usb/host/ohci-pxa27x.c
> @@ -312,8 +312,10 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
>                return PTR_ERR(usb_clk);
>
>        hcd = usb_create_hcd (driver, &pdev->dev, "pxa27x");
> -       if (!hcd)
> -               return -ENOMEM;
> +       if (!hcd) {
> +               retval = -ENOMEM;
> +               goto err0;
> +       }
>
>        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>        if (!r) {
> @@ -368,6 +370,7 @@ int usb_hcd_pxa27x_probe (const struct hc_driver *driver, struct platform_device
>        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
>  err1:
>        usb_put_hcd(hcd);
> + err0:
>        clk_put(usb_clk);
>        return retval;
>  }
>
>