Merge tag 'mmc-fixes-for-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / video / sunxvr500.c

diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
index eb931b8..6c71b1b 100644 (file)
--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -298,8 +298,10 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
                goto err_release_fb;
        }
        ep->ramdac = ioremap(ep->regs_base_phys + 0x8000, 0x1000);
-       if (!ep->ramdac)
+       if (!ep->ramdac) {
+               err = -ENOMEM;
                goto err_release_pci1;
+       }
 
        ep->fb8_0_off = readl(ep->ramdac + RAMDAC_VID_8FB_0);
        ep->fb8_0_off -= ep->fb_base_reg;
@@ -343,8 +345,10 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
        ep->fb_size = info->fix.line_length * ep->height;
 
        ep->fb_base = ioremap(ep->fb_base_phys, ep->fb_size);
-       if (!ep->fb_base)
+       if (!ep->fb_base) {
+               err = -ENOMEM;
                goto err_release_pci0;
+       }
 
        err = e3d_set_fbinfo(ep);
        if (err)