Skip to content

Commit

Permalink
fbdev/amifb: Do not call panic() if there's not enough Chip RAM
Browse files Browse the repository at this point in the history
Fail gracefully instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Geert Uytterhoeven authored and Paul Mundt committed May 24, 2011
1 parent e3e4e9c commit a707642
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/video/amifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a707642

Please sign in to comment.