summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-05-21 19:42:55 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 16:26:26 +0900
commita707642a0653c457376068d9d4a77afe93c10c93 (patch)
treeecb9644e592647971110545e9c62a7bf546ffe81
parente3e4e9c61eb7bbd1171a2b948f1ea4591bac8289 (diff)
downloadop-kernel-dev-a707642a0653c457376068d9d4a77afe93c10c93.zip
op-kernel-dev-a707642a0653c457376068d9d4a77afe93c10c93.tar.gz
fbdev/amifb: Do not call panic() if there's not enough Chip RAM
Fail gracefully instead. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/amifb.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 603f84f..1b0185c 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);
OpenPOWER on IntegriCloud