Messages in this thread Patch in this message | | | Date | Fri, 27 Nov 1998 18:56:57 +0100 | From | Philipp Rumpf <> | Subject | Re: 2.1.130 Oops decoded. ATI fb? |
| |
Sorry, forgot the patch ... --- linux/drivers/video/atyfb.c Thu Nov 19 20:56:24 1998 +++ linux-my/drivers/video/atyfb.c Fri Nov 27 18:51:57 1998 @@ -967,6 +967,11 @@ #endif #endif + if (! cursor->ram) { + kfree(cursor); + return NULL; + } + if (curblink) { init_timer(cursor->timer); cursor->timer->expires = jiffies + (HZ / 50); @@ -2910,6 +2915,11 @@ info->ati_regbase = (unsigned long) ioremap(info->ati_regbase_phys, 0x1000); + if(!info->ati_regbase) { + kfree(info); + return; + } + info->ati_regbase_phys += 0xc00; info->ati_regbase += 0xc00; @@ -2932,6 +2942,11 @@ info->frame_buffer_phys = addr; info->frame_buffer = (unsigned long)ioremap(addr, 0x800000); + if(!info->frame_buffer) { + kfree(info); + return; + } + #endif /* __sparc__ */ if (!aty_init(info, "PCI")) { @@ -2946,6 +2961,7 @@ prom_palette = atyfb_palette; /* + * Add /dev/fb mmap values. */ info->mmap_map[0].voff = 0x8000000000000000UL; @@ -3039,6 +3055,13 @@ info->ati_regbase_phys = 0x7ff000+addr; info->ati_regbase = (unsigned long)ioremap(info->ati_regbase_phys, 0x1000); + + if(! info->ati_regbase) { + printk("atyfb_init: ioremap() returned NULL\n"); + kfree(info); + return; + } + info->ati_regbase_phys += 0xc00; info->ati_regbase += 0xc00; @@ -3059,6 +3082,12 @@ /* Map in frame buffer */ info->frame_buffer_phys = addr; info->frame_buffer = (unsigned long)ioremap(addr, 0x800000); + + if(! info->frame_buffer) { + printk("atyfb_init: ioremap() returned NULL\n"); + kfree(info); + return; + } if (!aty_init(info, dp->full_name)) { kfree(info); | |