mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

fbdev/amifb: Do not call panic() if there's not enough Chip RAM

Browse source 
Fail gracefully instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Geert Uytterhoeven 2011-05-21 19:42:55 +00:00 committed by Paul Mundt
parent e3e4e9c61e
commit a707642a06
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/video/amifb.c
View file

@ -2230,8 +2230,10 @@ static inline u_long __init chipalloc(u_long size)
{
size += PAGE_SIZE-1;
if (!(unaligned_chipptr = (u_long)amiga_chip_alloc(size,
"amifb [RAM]")))
panic("No Chip RAM for frame buffer");
"amifb [RAM]"))) {
pr_err("amifb: No Chip RAM for frame buffer");
return 0;
}
memset((void *)unaligned_chipptr, 0, size);
return PAGE_ALIGN(unaligned_chipptr);
}
@ -2385,6 +2387,10 @@ static int __init amifb_probe(struct platform_device *pdev)
DUMMYSPRITEMEMSIZE+
COPINITSIZE+
4*COPLISTSIZE);
if (!chipptr) {
err = -ENOMEM;
goto amifb_error;
}
assignchunk(videomemory, u_long, chipptr, fb_info.fix.smem_len);
assignchunk(spritememory, u_long, chipptr, SPRITEMEMSIZE);