From 51b709af19c28b7108900b199ec8c15561213203 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 31 Mar 2009 15:25:23 -0700 Subject: [PATCH] --- yaml --- r: 139271 b: refs/heads/master c: 0fd853118dd821de59106c5b9a0a2a6f488bc4b5 h: refs/heads/master i: 139269: a638365753b60e9f53d0e6021a433fd947104e96 139267: dd46882e88a5c7158fa530b55d50d2d724cafb5a 139263: 78d0ae86fae40371c332f42aaab3a939df3e8856 v: v3 --- [refs] | 2 +- trunk/drivers/video/skeletonfb.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 99aa5f472689..2bc2ccde64ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e266e2e0e19532c1b8e2e2bff1eb6ccf42e478a +refs/heads/master: 0fd853118dd821de59106c5b9a0a2a6f488bc4b5 diff --git a/trunk/drivers/video/skeletonfb.c b/trunk/drivers/video/skeletonfb.c index df5336561d13..a439159204a8 100644 --- a/trunk/drivers/video/skeletonfb.c +++ b/trunk/drivers/video/skeletonfb.c @@ -795,8 +795,9 @@ static int __devinit xxxfb_probe(struct pci_dev *dev, if (!retval || retval == 4) return -EINVAL; - /* This has to been done !!! */ - fb_alloc_cmap(&info->cmap, cmap_len, 0); + /* This has to be done! */ + if (fb_alloc_cmap(&info->cmap, cmap_len, 0)) + return -ENOMEM; /* * The following is done in the case of having hardware with a static @@ -820,8 +821,10 @@ static int __devinit xxxfb_probe(struct pci_dev *dev, */ /* xxxfb_set_par(info); */ - if (register_framebuffer(info) < 0) + if (register_framebuffer(info) < 0) { + fb_dealloc_cmap(&info->cmap); return -EINVAL; + } printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id); pci_set_drvdata(dev, info); /* or platform_set_drvdata(pdev, info) */