Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drivers/video/pxa168fb.c: add missing clk_put

Browse Source 
Add a label for error-handling code in the case where only clk_get has
succeeded.  Rename the label failed to be consistent with the rest.

A simplified version of the semantic match that finds the missing clk_put
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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Julia Lawall 2011-06-01 17:10:13 +00:00 committed by Paul Mundt
parent 609d3bbf04
commit 0057f1809d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/video/pxa168fb.c
View File

@ -623,19 +623,21 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL) { if (res == NULL) {
dev_err(&pdev->dev, "no IO memory defined\n"); dev_err(&pdev->dev, "no IO memory defined\n");
return -ENOENT; ret = -ENOENT;
goto failed_put_clk;
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "no IRQ defined\n"); dev_err(&pdev->dev, "no IRQ defined\n");
return -ENOENT; ret = -ENOENT;
goto failed_put_clk;
} }
info = framebuffer_alloc(sizeof(struct pxa168fb_info), &pdev->dev); info = framebuffer_alloc(sizeof(struct pxa168fb_info), &pdev->dev);
if (info == NULL) { if (info == NULL) {
clk_put(clk); ret = -ENOMEM;
return -ENOMEM; goto failed_put_clk;
} }
/* Initialize private data */ /* Initialize private data */
@ -671,7 +673,7 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
fbi->reg_base = ioremap_nocache(res->start, resource_size(res)); fbi->reg_base = ioremap_nocache(res->start, resource_size(res));
if (fbi->reg_base == NULL) { if (fbi->reg_base == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto failed; goto failed_free_info;
} }
/* /*
@ -683,7 +685,7 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
&fbi->fb_start_dma, GFP_KERNEL); &fbi->fb_start_dma, GFP_KERNEL);
if (info->screen_base == NULL) { if (info->screen_base == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto failed; goto failed_free_info;
} }
info->fix.smem_start = (unsigned long)fbi->fb_start_dma; info->fix.smem_start = (unsigned long)fbi->fb_start_dma;
@ -772,8 +774,9 @@ failed_free_clk:
failed_free_fbmem: failed_free_fbmem:
dma_free_coherent(fbi->dev, info->fix.smem_len, dma_free_coherent(fbi->dev, info->fix.smem_len,
info->screen_base, fbi->fb_start_dma); info->screen_base, fbi->fb_start_dma);
failed: failed_free_info:
kfree(info); kfree(info);
failed_put_clk:
clk_put(clk); clk_put(clk);
dev_err(&pdev->dev, "frame buffer device init failed with %d\n", ret); dev_err(&pdev->dev, "frame buffer device init failed with %d\n", ret);