Skip to content

Commit

Permalink
drivers/video/fsl-diu-fb.c: add missing of_node_put
Browse files Browse the repository at this point in the history
of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.

The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@

n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
    when != n1 = f1(n,...)
    when != E1 = n
    when any
    when strict
(
+ of_node_put(n);
  return -C;
|
  of_node_put(n);
|
  n2 = f2(n,...)
|
  E2 = n
|
  return ...;
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Timur Tabi <timur@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Aug 5, 2008
1 parent 9bd6ceb commit 5394ba0
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/video/fsl-diu-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1649,8 +1649,10 @@ static int __init fsl_diu_init(void)
}

prop = of_get_property(np, "d-cache-size", NULL);
if (prop == NULL)
if (prop == NULL) {
of_node_put(np);
return -ENODEV;
}

/* Freescale PLRU requires 13/8 times the cache size to do a proper
displacement flush
Expand All @@ -1659,8 +1661,10 @@ static int __init fsl_diu_init(void)
coherence_data_size /= 8;

prop = of_get_property(np, "d-cache-line-size", NULL);
if (prop == NULL)
if (prop == NULL) {
of_node_put(np);
return -ENODEV;
}
d_cache_line_size = *prop;

of_node_put(np);
Expand Down

0 comments on commit 5394ba0

Please sign in to comment.