| Message ID | 1306948213-20767-8-git-send-email-julia@diku.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 01, 2011 at 07:10:11PM +0200, Julia Lawall wrote: > From: Julia Lawall <julia@diku.dk> > > Reorder the labels at the end of the function to correspond to the order in > which the resources are allocated. > > 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@diku.dk> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> > > --- > drivers/video/imxfb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c > index d2ccfd6..f135dbe 100644 > --- a/drivers/video/imxfb.c > +++ b/drivers/video/imxfb.c > @@ -856,10 +856,10 @@ failed_platform_init: > dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu, > fbi->map_dma); > failed_map: > - clk_put(fbi->clk); > -failed_getclock: > iounmap(fbi->regs); > failed_ioremap: > + clk_put(fbi->clk); > +failed_getclock: > release_mem_region(res->start, resource_size(res)); > failed_req: > kfree(info->pseudo_palette); > >
On Wed, Jun 01, 2011 at 07:10:11PM +0200, Julia Lawall wrote: > drivers/video/imxfb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) On Wed, Jun 01, 2011 at 07:10:13PM +0200, Julia Lawall wrote: > drivers/video/pxa168fb.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > Both applied, thanks.
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index d2ccfd6..f135dbe 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -856,10 +856,10 @@ failed_platform_init: dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu, fbi->map_dma); failed_map: - clk_put(fbi->clk); -failed_getclock: iounmap(fbi->regs); failed_ioremap: + clk_put(fbi->clk); +failed_getclock: release_mem_region(res->start, resource_size(res)); failed_req: kfree(info->pseudo_palette);