From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Tue, 8 May 2007 07:40:16 +0000 (-0700)
Subject: pm2fb: fix of jumps in pm2fb_probe
X-Git-Tag: v2.6.22-rc1~364
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=435d56fcd45cdf32bfb4db5d4e1efe17f3da95b2;p=linux-2.6

pm2fb: fix of jumps in pm2fb_probe

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>
---

diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 7f4c753b1d..1ac5264bb2 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -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);