From d0ce01d6f0fd4d5154f1fe17d86199cde859c3a6 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Fri, 26 Mar 2010 15:45:39 -0600 Subject: [PATCH] --- yaml --- r: 193549 b: refs/heads/master c: 1b1f8cd299d3c5a90c2ec1c24c271a0b536e5891 h: refs/heads/master i: 193547: 6556e2dad2106d304c639ce8d826987ea94d439c v: v3 --- [refs] | 2 +- trunk/drivers/video/via/viafbdev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e160158c8529..eb68b72ae231 100644 --- 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 index 8af405bf077b..8955ab4caac8 100644 --- 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: