]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
pm2fb: fix of jumps in pm2fb_probe
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Tue, 8 May 2007 07:40:16 +0000 (00:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 8 May 2007 18:15:33 +0000 (11:15 -0700)
This patch fixes incorrect targets of jumps when an error occurs in the
pm2fb_probe.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/pm2fb.c

index 7f4c753b1d890e5a373e69ce0c5f418892dc7dee..1ac5264bb2c150cdfeee12b5c43203aab6bcc7c1 100644 (file)
@@ -1335,10 +1335,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                info->var = pm2fb_var;
 
        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
-               goto err_exit_all;
+               goto err_exit_both;
 
        if (register_framebuffer(info) < 0)
-               goto err_exit_both;
+               goto err_exit_all;
 
        printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",
               info->node, info->fix.id, pm2fb_fix.smem_len / 1024);