[PATCH] tridentfb: improve probe function
flat view
DORMANTno replies
From: Krzysztof Helt <hidden>
Date: 2008-05-09 20:40:04
From: Krzysztof Helt <redacted>
Add missing release of allocated fb_info structure and
move enable_mmio() to fix error path.
Signed-off-by: Krzysztof Helt <redacted>
diff -urp linux-2.6.25/drivers/video/tridentfb.c linux-new/drivers/video/tridentfb.c--- linux-2.6.25/drivers/video/tridentfb.c 2008-05-09 08:28:00.742612723 +0200
+++ linux-new/drivers/video/tridentfb.c 2008-05-09 18:54:29.494355715 +0200@@ -1287,6 +1291,7 @@ static int __devinit trident_pci_probe(s if (!request_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len, "tridentfb")) { debug("request_region failed!\n"); + framebuffer_release(info); return -1; }
@@ -1299,8 +1304,6 @@ static int __devinit trident_pci_probe(s goto out_unmap1; } - enable_mmio(); - /* setup framebuffer memory */ tridentfb_fix.smem_start = pci_resource_start(dev, 0); tridentfb_fix.smem_len = get_memsize(default_par);
@@ -1312,6 +1315,8 @@ static int __devinit trident_pci_probe(s goto out_unmap1; } + enable_mmio(); + info->screen_base = ioremap_nocache(tridentfb_fix.smem_start, tridentfb_fix.smem_len); ----------------------------------------------------------------------
Poprowadz swoj klub do zwyciestwa! Sprawdz >>> http://link.interia.pl/f1d76 ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone