---

yaml --- r: 193549 b: refs/heads/master c: 1b1f8cd h: refs/heads/master i: 193547: 6556e2d v: v3
git-mirror · Apr 20, 2010 · d0ce01d · d0ce01d
1 parent 6db771b
commit d0ce01d
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: b72a5070c74f5ca9a45a03c2d625daab66d0a820
+refs/heads/master: 1b1f8cd299d3c5a90c2ec1c24c271a0b536e5891
diff --git a/trunk/drivers/video/via/viafbdev.c b/trunk/drivers/video/via/viafbdev.c
@@ -1870,7 +1870,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
 			printk(KERN_ERR
 			"allocate the second framebuffer struct error\n");
 			rc = -ENOMEM;
-			goto out_delete_i2c;
+			goto out_unmap_screen;
 		}
 		viaparinfo1 = viafbinfo1->par;
 		memcpy(viaparinfo1, viaparinfo, viafb_par_length);
@@ -1961,6 +1961,8 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
 out_fb1_release:
 	if (viafbinfo1)
 		framebuffer_release(viafbinfo1);
+out_unmap_screen:
+	iounmap(viafbinfo->screen_base);
 out_delete_i2c:
 	viafb_delete_i2c_buss(viaparinfo);
 out_fb_release: