pm2fb: correct error values returned from probe function

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>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 30181b593829..82aa8242f441 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -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",