Skip to content

Commit

Permalink
viafb: Unmap the frame buffer on initialization error
Browse files Browse the repository at this point in the history
This was part of Harald's "make viafb a first-class citizen using
pci_driver" patch, but somehow got dropped when that patch went into
mainline.

Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: ScottFang@viatech.com.cn
Cc: JosephChan@via.com.tw
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
  • Loading branch information
Jonathan Corbet committed Apr 20, 2010
1 parent b72a507 commit 1b1f8cd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/video/via/viafbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 1b1f8cd

Please sign in to comment.