From d2da867a6d19a9cac2f6a9e86cf1c0f3bfc132b5 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 13 Apr 2003 23:45:04 -0700 Subject: [PATCH] [PATCH] Atari Atyfb fixes Atyfb fixes for Atari: - Add missing allocation of default_par - Kill warnings in assignments --- drivers/video/aty/atyfb_base.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 0eb14a9923ab5..42c068a984cef 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -2278,15 +2278,25 @@ int __init atyfb_init(void) return -ENOMEM; } memset(info, 0, sizeof(struct fb_info)); - info->fix = atyfb_fix; + + default_par = kmalloc(sizeof(struct atyfb_par), GFP_ATOMIC); + if (!default_par) { + printk + ("atyfb_init: can't alloc atyfb_par\n"); + kfree(info); + return -ENXIO; + } + memset(default_par, 0, sizeof(struct atyfb_par)); + + info->fix = atyfb_fix; /* * Map the video memory (physical address given) to somewhere in the * kernel address space. */ - info->screen_base = (unsigned long)ioremap(phys_vmembase[m64_num], + info->screen_base = ioremap(phys_vmembase[m64_num], phys_size[m64_num]); - info->fix.smem_start = info->screen_base; /* Fake! */ + info->fix.smem_start = (unsigned long)info->screen_base; /* Fake! */ default_par->ati_regbase = (unsigned long)ioremap(phys_guiregbase[m64_num], 0x10000) + 0xFC00ul; info->fix.mmio_start = default_par->ati_regbase; /* Fake! */ -- 2.53.0