diff options
author | Julia Lawall <julia@diku.dk> | 2009-12-15 19:46:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:20:01 -0500 |
commit | d2a34c13e7ccec5d06eafd60e6f80ea531b34668 (patch) | |
tree | 535f0ba7f4b95d53d3d871bc6a49d2fecf22b052 | |
parent | 2f390380ca69e1617cdddb12d8da94f0a9f4319d (diff) |
drivers/video: Move dereference after NULL test
If the NULL test on fbi is needed, then the dereference should be after the
NULL test.
A simplified version of the semantic match that detects this problem is as
follows (http://coccinelle.lip6.fr/):
// <smpl>
@match exists@
expression x, E;
identifier fld;
@@
* x->fld
... when != \(x = E\|&x\)
* x == NULL
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/pxafb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index b7e58059b592..415858b421b3 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -1221,13 +1221,14 @@ static void setup_smart_timing(struct pxafb_info *fbi, | |||
1221 | static int pxafb_smart_thread(void *arg) | 1221 | static int pxafb_smart_thread(void *arg) |
1222 | { | 1222 | { |
1223 | struct pxafb_info *fbi = arg; | 1223 | struct pxafb_info *fbi = arg; |
1224 | struct pxafb_mach_info *inf = fbi->dev->platform_data; | 1224 | struct pxafb_mach_info *inf; |
1225 | 1225 | ||
1226 | if (!fbi || !inf->smart_update) { | 1226 | if (!fbi || !fbi->dev->platform_data->smart_update) { |
1227 | pr_err("%s: not properly initialized, thread terminated\n", | 1227 | pr_err("%s: not properly initialized, thread terminated\n", |
1228 | __func__); | 1228 | __func__); |
1229 | return -EINVAL; | 1229 | return -EINVAL; |
1230 | } | 1230 | } |
1231 | inf = fbi->dev->platform_data; | ||
1231 | 1232 | ||
1232 | pr_debug("%s(): task starting\n", __func__); | 1233 | pr_debug("%s(): task starting\n", __func__); |
1233 | 1234 | ||