---

yaml --- r: 139277 b: refs/heads/master c: 327fc87 h: refs/heads/master i: 139275: 846cad5 v: v3
git-mirror · Apr 1, 2009 · f97de8d · f97de8d
1 parent bfcfac7
commit f97de8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);