aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/via/viafbdev.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 743eed48a5f7..72759b620e7f 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -2134,12 +2134,16 @@ static int __devinit via_pci_probe(void)
2134 2134
2135 if (!viaparinfo->fbmem_virt) { 2135 if (!viaparinfo->fbmem_virt) {
2136 printk(KERN_INFO "ioremap failed\n"); 2136 printk(KERN_INFO "ioremap failed\n");
2137 return -1; 2137 return -ENOMEM;
2138 } 2138 }
2139 2139
2140 viafb_get_mmio_info(&viaparinfo->mmio_base, &viaparinfo->mmio_len); 2140 viafb_get_mmio_info(&viaparinfo->mmio_base, &viaparinfo->mmio_len);
2141 viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base, 2141 viaparinfo->io_virt = ioremap_nocache(viaparinfo->mmio_base,
2142 viaparinfo->mmio_len); 2142 viaparinfo->mmio_len);
2143 if (!viaparinfo->io_virt) {
2144 printk(KERN_WARNING "ioremap failed: hardware acceleration disabled\n");
2145 viafb_accel = 0;
2146 }
2143 2147
2144 viafbinfo->node = 0; 2148 viafbinfo->node = 0;
2145 viafbinfo->fbops = &viafb_ops; 2149 viafbinfo->fbops = &viafb_ops;