Skip to content

Commit

Permalink
pm2fb: correct error values returned from probe function
Browse files Browse the repository at this point in the history
Fix error values returned in some code branches in the pm2fb_probe() function.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
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>
  • Loading branch information
Krzysztof Helt authored and Linus Torvalds committed Apr 28, 2008
1 parent 416e74e commit 2ae09f0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/video/pm2fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1687,10 +1687,12 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
if (!err || err == 4)
info->var = pm2fb_var;

if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
retval = fb_alloc_cmap(&info->cmap, 256, 0);
if (retval < 0)
goto err_exit_both;

if (register_framebuffer(info) < 0)
retval = register_framebuffer(info);
if (retval < 0)
goto err_exit_all;

printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",
Expand Down

0 comments on commit 2ae09f0

Please sign in to comment.