diff --git a/[refs] b/[refs]
index 969a76e6e621..5e146aa52d7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 416e74ea7813597b586eafc24f67779eeb86e12f
+refs/heads/master: 2ae09f0da1cd0c8c646edea2e68356e76789461c
diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c
index 30181b593829..82aa8242f441 100644
--- a/trunk/drivers/video/pm2fb.c
+++ b/trunk/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",