break;
        default:
                /* should never occur */
+               ret = -EIO;
                goto rel_reg;
        }
 
        par->fb_base = ioremap(par->fb_base_phys, par->mapped_vram);
        if (par->fb_base == NULL) {
                dev_err(dev, "Cannot map framebuffer\n");
+               ret = -EIO;
                goto rel_reg;
        }
 
        dev_dbg(dev, "mmio phys 0x%llx 0x%lx\n",
                (unsigned long long)par->mmio_base_phys, (ulong)par->mmio_len);
 
-       if (mb862xx_pci_gdc_init(par))
+       ret = mb862xx_pci_gdc_init(par);
+       if (ret)
                goto io_unmap;
 
-       if (request_irq(par->irq, mb862xx_intr, IRQF_SHARED,
-                       DRV_NAME, (void *)par)) {
+       ret = request_irq(par->irq, mb862xx_intr, IRQF_SHARED,
+                         DRV_NAME, (void *)par);
+       if (ret) {
                dev_err(dev, "Cannot request irq\n");
                goto io_unmap;
        }