Commit d2da867a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] Atari Atyfb fixes

Atyfb fixes for Atari:
  - Add missing allocation of default_par
  - Kill warnings in assignments
parent 58ebb0e6
...@@ -2278,15 +2278,25 @@ int __init atyfb_init(void) ...@@ -2278,15 +2278,25 @@ int __init atyfb_init(void)
return -ENOMEM; return -ENOMEM;
} }
memset(info, 0, sizeof(struct fb_info)); 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 * Map the video memory (physical address given) to somewhere in the
* kernel address space. * 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]); 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], default_par->ati_regbase = (unsigned long)ioremap(phys_guiregbase[m64_num],
0x10000) + 0xFC00ul; 0x10000) + 0xFC00ul;
info->fix.mmio_start = default_par->ati_regbase; /* Fake! */ info->fix.mmio_start = default_par->ati_regbase; /* Fake! */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment