Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb8972b4 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

amifb: check fb_alloc_cmap return value and handle failure properly 



Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 909baf00

drivers/video/amifb.c

+5 −2
Original line number Diff line number Diff line
@@ -2437,7 +2437,9 @@ static int __init amifb_init(void) 
		goto amifb_error;

	}



	fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);

	err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);

	if (err)

		goto amifb_error;



	if (register_framebuffer(&fb_info) < 0) {

		err = -EINVAL;
@@ -2456,6 +2458,7 @@ static int __init amifb_init(void) 


static void amifb_deinit(void)

{

	if (fb_info.cmap.len)

		fb_dealloc_cmap(&fb_info.cmap);

	chipfree();

	if (videomemory)