diff options
| author |   Andres Salomon <dilinger@queued.net> | 2009-03-31 15:25:23 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 08:59:30 -0700 |
| commit | 0fd853118dd821de59106c5b9a0a2a6f488bc4b5 (patch) | |
| tree | 6d008cda04b460a484a8bc44f1b13e7a3c633e7f /drivers | |
| parent | vfb: fix memory leaks in removal path (diff) | |
| download | linux-dev-0fd853118dd821de59106c5b9a0a2a6f488bc4b5.tar.xz linux-dev-0fd853118dd821de59106c5b9a0a2a6f488bc4b5.zip | |
skeletonfb: check fb_alloc_cmap return value and handle failure properly
Bad example code, no cookie!
Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/skeletonfb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c index df5336561d13..a439159204a8 100644 --- a/drivers/video/skeletonfb.c +++ b/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) */ |