diff options
Diffstat (limited to 'drivers/video/mb862xx/mb862xxfbdrv.c')
-rw-r--r-- | drivers/video/mb862xx/mb862xxfbdrv.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c index 57d940be5f3d..d68e332aa21c 100644 --- a/drivers/video/mb862xx/mb862xxfbdrv.c +++ b/drivers/video/mb862xx/mb862xxfbdrv.c | |||
@@ -1052,12 +1052,14 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, | |||
1052 | break; | 1052 | break; |
1053 | default: | 1053 | default: |
1054 | /* should never occur */ | 1054 | /* should never occur */ |
1055 | ret = -EIO; | ||
1055 | goto rel_reg; | 1056 | goto rel_reg; |
1056 | } | 1057 | } |
1057 | 1058 | ||
1058 | par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram); | 1059 | par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram); |
1059 | if (par->fb_base == NULL) { | 1060 | if (par->fb_base == NULL) { |
1060 | dev_err(dev, "Cannot map framebuffer\n"); | 1061 | dev_err(dev, "Cannot map framebuffer\n"); |
1062 | ret = -EIO; | ||
1061 | goto rel_reg; | 1063 | goto rel_reg; |
1062 | } | 1064 | } |
1063 | 1065 | ||
@@ -1073,11 +1075,13 @@ static int __devinit mb862xx_pci_probe(struct pci_dev *pdev, | |||
1073 | dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", | 1075 | dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n", |
1074 | (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len); | 1076 | (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len); |
1075 | 1077 | ||
1076 | if (mb862xx_pci_gdc_init(par)) | 1078 | ret = mb862xx_pci_gdc_init(par); |
1079 | if (ret) | ||
1077 | goto io_unmap; | 1080 | goto io_unmap; |
1078 | 1081 | ||
1079 | if (request_irq(par->irq, mb862xx_intr, IRQF_SHARED, | 1082 | ret = request_irq(par->irq, mb862xx_intr, IRQF_SHARED, |
1080 | DRV_NAME, (void *)par)) { | 1083 | DRV_NAME, (void *)par); |
1084 | if (ret) { | ||
1081 | dev_err(dev, "Cannot request irq\n"); | 1085 | dev_err(dev, "Cannot request irq\n"); |
1082 | goto io_unmap; | 1086 | goto io_unmap; |
1083 | } | 1087 | } |