From 2390806f0727eda303a86d746d909124b00040bb Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 28 Apr 2008 02:15:45 -0700 Subject: [PATCH] --- yaml --- r: 94202 b: refs/heads/master c: 8224c3b166db81a8dbd128df455453897fe2b48b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/w100fb.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 77cc7851b63d..09b8a0dc663f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e170c72c0c55bd78213a0f5053bd9a1dde403b7 +refs/heads/master: 8224c3b166db81a8dbd128df455453897fe2b48b diff --git a/trunk/drivers/video/w100fb.c b/trunk/drivers/video/w100fb.c index 003c49a490eb..30469bf906e5 100644 --- a/trunk/drivers/video/w100fb.c +++ b/trunk/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)