diff --git a/[refs] b/[refs]
index 92ba4a8d22d3..f5ce818838d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc880a715782fe31116284d90e0b5bfb1411535b
+refs/heads/master: 327fc8752a3c08fc7dc7d382883e65aad2f03bde
diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c
index 680642c089c9..a86046ff60ad 100644
--- a/trunk/drivers/video/tgafb.c
+++ b/trunk/drivers/video/tgafb.c
@@ -1663,7 +1663,7 @@ tgafb_register(struct device *dev)
 	if (register_framebuffer(info) < 0) {
 		printk(KERN_ERR "tgafb: Could not register framebuffer\n");
 		ret = -EINVAL;
-		goto err1;
+		goto err2;
 	}
 
 	if (tga_bus_pci) {
@@ -1682,6 +1682,8 @@ tgafb_register(struct device *dev)
 
 	return 0;
 
+ err2:
+	fb_dealloc_cmap(&info->cmap);
  err1:
 	if (mem_base)
 		iounmap(mem_base);