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

[Eric Miao]

On Thu, Jun 2, 2011 at 1:10 AM, Julia Lawall <julia@xxxxxxx> wrote:
> From: Julia Lawall <julia@xxxxxxx>
>
> 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 <julia@xxxxxxx>
>

Acked-by: Eric Miao <eric.y.miao@xxxxxxxxx>

> ---
> Â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;
> Â}
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/