summaryrefslogtreecommitdiffstats
path: root/drivers/video/carminefb.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-01-02 14:27:42 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-01-06 15:46:56 +0900
commite045da7d835a28950543f5f10f0cb1905ca9bbaf (patch)
tree49b70bb5ec592f2638804943f3c87218340002a5 /drivers/video/carminefb.c
parent7ee04fd5d5ff74f81d8eee128bc9346ab87c56b8 (diff)
downloadop-kernel-dev-e045da7d835a28950543f5f10f0cb1905ca9bbaf.zip
op-kernel-dev-e045da7d835a28950543f5f10f0cb1905ca9bbaf.tar.gz
drivers/video/carminefb.c: improve error handling
This code had an error handling goto to the wrong place, a misplaced release_mem_region, and a duplicated release_mem_region. The semantic match that finds the double release_mem_region is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ expression e1,e2,e3; position p1,p2,p3; @@ release_mem_region@p1(e1, e2)@p3; ... when != request_mem_region(e1,e2,e3) release_mem_region(e1, e2)@p2; @@ expression e <= r.e1,e3; expression r.e1,e2; position r.p1,r.p2,r.p3,p!=r.p1; @@ *release_mem_region(e1, e2)@p3; ... when != e = e3 *release_mem_region@p(e1, e2)@p2;// </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/carminefb.c')
-rw-r--r--drivers/video/carminefb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index 6b19136..caaa27d 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -654,7 +654,7 @@ static int __devinit carminefb_probe(struct pci_dev *dev,
printk(KERN_ERR "carminefb: Memory bar is only %d bytes, %d "
"are required.", carminefb_fix.smem_len,
CARMINE_TOTAL_DIPLAY_MEM);
- goto err_free_reg_mmio;
+ goto err_unmap_vregs;
}
if (!request_mem_region(carminefb_fix.smem_start,
@@ -667,8 +667,6 @@ static int __devinit carminefb_probe(struct pci_dev *dev,
carminefb_fix.smem_len);
if (!hw->screen_mem) {
printk(KERN_ERR "carmine: Can't ioremap smem area.\n");
- release_mem_region(carminefb_fix.smem_start,
- carminefb_fix.smem_len);
goto err_reg_smem;
}
@@ -710,7 +708,7 @@ err_deinit_hw:
err_unmap_screen:
iounmap(hw->screen_mem);
err_reg_smem:
- release_mem_region(carminefb_fix.mmio_start, carminefb_fix.mmio_len);
+ release_mem_region(carminefb_fix.smem_start, carminefb_fix.smem_len);
err_unmap_vregs:
iounmap(hw->v_regs);
err_free_reg_mmio:
OpenPOWER on IntegriCloud