From a707642a0653c457376068d9d4a77afe93c10c93 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sat, 21 May 2011 19:42:55 +0000 Subject: fbdev/amifb: Do not call panic() if there's not enough Chip RAM Fail gracefully instead. Signed-off-by: Geert Uytterhoeven Signed-off-by: Paul Mundt --- drivers/video/amifb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 603f84fae6a..1b0185cf686 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c @@ -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 @@ default_chipset: 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); -- cgit v1.2.3-70-g09d2