Commit 2ae09f0d authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

pm2fb: correct error values returned from probe function

Fix error values returned in some code branches in the pm2fb_probe() function.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 416e74ea
...@@ -1687,10 +1687,12 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, ...@@ -1687,10 +1687,12 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
if (!err || err == 4) if (!err || err == 4)
info->var = pm2fb_var; 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; goto err_exit_both;
if (register_framebuffer(info) < 0) retval = register_framebuffer(info);
if (retval < 0)
goto err_exit_all; goto err_exit_all;
printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n", printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment