summaryrefslogtreecommitdiffstats
path: root/drivers/video/w100fb.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-04-28 02:15:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:41 -0700
commit8224c3b166db81a8dbd128df455453897fe2b48b (patch)
tree757864098a1a49311d359613cd6c3135f18e6772 /drivers/video/w100fb.c
parent0e170c72c0c55bd78213a0f5053bd9a1dde403b7 (diff)
downloadop-kernel-dev-8224c3b166db81a8dbd128df455453897fe2b48b.zip
op-kernel-dev-8224c3b166db81a8dbd128df455453897fe2b48b.tar.gz
drivers/video/w100fb.c: avoid a couple of error-path NULL derefs
Fix a couple of error-patch oopses identified by Marcio Buss in http://bugzilla.kernel.org/show_bug.cgi?id=9567. Cc: Marcio Buss <marciobuss@gmail.com> Cc: Jeff Zhou <xinzhou.sjtu@gmail.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/w100fb.c')
-rw-r--r--drivers/video/w100fb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 003c49a..30469bf 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -765,8 +765,10 @@ int __init w100fb_probe(struct platform_device *pdev)
printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
return 0;
out:
- fb_dealloc_cmap(&info->cmap);
- kfree(info->pseudo_palette);
+ if (info) {
+ fb_dealloc_cmap(&info->cmap);
+ kfree(info->pseudo_palette);
+ }
if (remapped_fbuf != NULL)
iounmap(remapped_fbuf);
if (remapped_regs != NULL)
OpenPOWER on IntegriCloud