提交 a707642a 编写于 作者: G Geert Uytterhoeven 提交者: Paul Mundt

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

Fail gracefully instead.
Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: NPaul Mundt <lethal@linux-sh.org>
上级 e3e4e9c6
...@@ -2230,8 +2230,10 @@ static inline u_long __init chipalloc(u_long size) ...@@ -2230,8 +2230,10 @@ static inline u_long __init chipalloc(u_long size)
{ {
size += PAGE_SIZE-1; size += PAGE_SIZE-1;
if (!(unaligned_chipptr = (u_long)amiga_chip_alloc(size, if (!(unaligned_chipptr = (u_long)amiga_chip_alloc(size,
"amifb [RAM]"))) "amifb [RAM]"))) {
panic("No Chip RAM for frame buffer"); pr_err("amifb: No Chip RAM for frame buffer");
return 0;
}
memset((void *)unaligned_chipptr, 0, size); memset((void *)unaligned_chipptr, 0, size);
return PAGE_ALIGN(unaligned_chipptr); return PAGE_ALIGN(unaligned_chipptr);
} }
...@@ -2385,6 +2387,10 @@ static int __init amifb_probe(struct platform_device *pdev) ...@@ -2385,6 +2387,10 @@ static int __init amifb_probe(struct platform_device *pdev)
DUMMYSPRITEMEMSIZE+ DUMMYSPRITEMEMSIZE+
COPINITSIZE+ COPINITSIZE+
4*COPLISTSIZE); 4*COPLISTSIZE);
if (!chipptr) {
err = -ENOMEM;
goto amifb_error;
}
assignchunk(videomemory, u_long, chipptr, fb_info.fix.smem_len); assignchunk(videomemory, u_long, chipptr, fb_info.fix.smem_len);
assignchunk(spritememory, u_long, chipptr, SPRITEMEMSIZE); assignchunk(spritememory, u_long, chipptr, SPRITEMEMSIZE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册