diff options
Diffstat (limited to 'drivers/video/sunxvr500.c')
-rw-r--r-- | drivers/video/sunxvr500.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index eb931b8626fa..6c71b1b44477 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c | |||
@@ -298,8 +298,10 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev, | |||
298 | goto err_release_fb; | 298 | goto err_release_fb; |
299 | } | 299 | } |
300 | ep->ramdac = ioremap(ep->regs_base_phys + 0x8000, 0x1000); | 300 | ep->ramdac = ioremap(ep->regs_base_phys + 0x8000, 0x1000); |
301 | if (!ep->ramdac) | 301 | if (!ep->ramdac) { |
302 | err = -ENOMEM; | ||
302 | goto err_release_pci1; | 303 | goto err_release_pci1; |
304 | } | ||
303 | 305 | ||
304 | ep->fb8_0_off = readl(ep->ramdac + RAMDAC_VID_8FB_0); | 306 | ep->fb8_0_off = readl(ep->ramdac + RAMDAC_VID_8FB_0); |
305 | ep->fb8_0_off -= ep->fb_base_reg; | 307 | ep->fb8_0_off -= ep->fb_base_reg; |
@@ -343,8 +345,10 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev, | |||
343 | ep->fb_size = info->fix.line_length * ep->height; | 345 | ep->fb_size = info->fix.line_length * ep->height; |
344 | 346 | ||
345 | ep->fb_base = ioremap(ep->fb_base_phys, ep->fb_size); | 347 | ep->fb_base = ioremap(ep->fb_base_phys, ep->fb_size); |
346 | if (!ep->fb_base) | 348 | if (!ep->fb_base) { |
349 | err = -ENOMEM; | ||
347 | goto err_release_pci0; | 350 | goto err_release_pci0; |
351 | } | ||
348 | 352 | ||
349 | err = e3d_set_fbinfo(ep); | 353 | err = e3d_set_fbinfo(ep); |
350 | if (err) | 354 | if (err) |