* [PATCH 15/15] arch/arm/mach-omap2/smartreflex.c: add missing iounmap
@ 2012-01-12 9:55 Julia Lawall
2012-01-27 0:37 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Julia Lawall @ 2012-01-12 9:55 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Add missing iounmap in error handling code, in a case where the function
already preforms iounmap on some other execution path.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression e;
statement S,S1;
int ret;
@@
e = \(ioremap\|ioremap_nocache\)(...)
... when != iounmap(e)
if (<+...e...+>) S
... when any
when != iounmap(e)
*if (...)
{ ... when != iounmap(e)
return ...; }
... when any
iounmap(e);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
arch/arm/mach-omap2/smartreflex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 9dd9345..7e755bb 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -897,7 +897,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
ret = sr_late_init(sr_info);
if (ret) {
pr_warning("%s: Error in SR late init\n", __func__);
- return ret;
+ goto err_iounmap;
}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 15/15] arch/arm/mach-omap2/smartreflex.c: add missing iounmap
2012-01-12 9:55 [PATCH 15/15] arch/arm/mach-omap2/smartreflex.c: add missing iounmap Julia Lawall
@ 2012-01-27 0:37 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2012-01-27 0:37 UTC (permalink / raw)
To: linux-arm-kernel
* Julia Lawall <Julia.Lawall@lip6.fr> [120112 01:23]:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Add missing iounmap in error handling code, in a case where the function
> already preforms iounmap on some other execution path.
Thanks I'll apply this into omap fixes branch.
Regards,
Tony
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression e;
> statement S,S1;
> int ret;
> @@
> e = \(ioremap\|ioremap_nocache\)(...)
> ... when != iounmap(e)
> if (<+...e...+>) S
> ... when any
> when != iounmap(e)
> *if (...)
> { ... when != iounmap(e)
> return ...; }
> ... when any
> iounmap(e);
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> ---
> arch/arm/mach-omap2/smartreflex.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
> index 9dd9345..7e755bb 100644
> --- a/arch/arm/mach-omap2/smartreflex.c
> +++ b/arch/arm/mach-omap2/smartreflex.c
> @@ -897,7 +897,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
> ret = sr_late_init(sr_info);
> if (ret) {
> pr_warning("%s: Error in SR late init\n", __func__);
> - return ret;
> + goto err_iounmap;
> }
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-27 0:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-12 9:55 [PATCH 15/15] arch/arm/mach-omap2/smartreflex.c: add missing iounmap Julia Lawall
2012-01-27 0:37 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).