]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
pm2fb: correct error values returned from probe function
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Mon, 28 Apr 2008 09:14:51 +0000 (02:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Apr 2008 15:58:35 +0000 (08:58 -0700)
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>
drivers/video/pm2fb.c

index 30181b593829b1e94fe6d5229965d8894c4357cd..82aa8242f441df0b4cb229b6a5d848f5fa89db39 100644 (file)
@@ -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",