diff options
-rw-r--r-- | drivers/video/carminefb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c index 6b19136aa181..caaa27d4a46a 100644 --- a/drivers/video/carminefb.c +++ b/drivers/video/carminefb.c | |||
@@ -654,7 +654,7 @@ static int __devinit carminefb_probe(struct pci_dev *dev, | |||
654 | printk(KERN_ERR "carminefb: Memory bar is only %d bytes, %d " | 654 | printk(KERN_ERR "carminefb: Memory bar is only %d bytes, %d " |
655 | "are required.", carminefb_fix.smem_len, | 655 | "are required.", carminefb_fix.smem_len, |
656 | CARMINE_TOTAL_DIPLAY_MEM); | 656 | CARMINE_TOTAL_DIPLAY_MEM); |
657 | goto err_free_reg_mmio; | 657 | goto err_unmap_vregs; |
658 | } | 658 | } |
659 | 659 | ||
660 | if (!request_mem_region(carminefb_fix.smem_start, | 660 | if (!request_mem_region(carminefb_fix.smem_start, |
@@ -667,8 +667,6 @@ static int __devinit carminefb_probe(struct pci_dev *dev, | |||
667 | carminefb_fix.smem_len); | 667 | carminefb_fix.smem_len); |
668 | if (!hw->screen_mem) { | 668 | if (!hw->screen_mem) { |
669 | printk(KERN_ERR "carmine: Can't ioremap smem area.\n"); | 669 | printk(KERN_ERR "carmine: Can't ioremap smem area.\n"); |
670 | release_mem_region(carminefb_fix.smem_start, | ||
671 | carminefb_fix.smem_len); | ||
672 | goto err_reg_smem; | 670 | goto err_reg_smem; |
673 | } | 671 | } |
674 | 672 | ||
@@ -710,7 +708,7 @@ err_deinit_hw: | |||
710 | err_unmap_screen: | 708 | err_unmap_screen: |
711 | iounmap(hw->screen_mem); | 709 | iounmap(hw->screen_mem); |
712 | err_reg_smem: | 710 | err_reg_smem: |
713 | release_mem_region(carminefb_fix.mmio_start, carminefb_fix.mmio_len); | 711 | release_mem_region(carminefb_fix.smem_start, carminefb_fix.smem_len); |
714 | err_unmap_vregs: | 712 | err_unmap_vregs: |
715 | iounmap(hw->v_regs); | 713 | iounmap(hw->v_regs); |
716 | err_free_reg_mmio: | 714 | err_free_reg_mmio: |