--- linux-2.6.21.orig/drivers/video/pm2fb.c	2007-05-03 14:46:06.000000000 +0200
+++ linux-2.6.21/drivers/video/pm2fb.c	2007-05-03 14:46:59.000000000 +0200
@@ -1210,10 +1209,10 @@ static int __devinit pm2fb_probe(struct 
 		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);