Re: Linux 2.4.10-pre12

[Geert Uytterhoeven]

On Tue, 18 Sep 2001, Linus Torvalds wrote:
> pre12:
>  - Alan Cox: much more merging

Anybody with an idea where this comes from?!?

  - There should be a test for a failed kmalloc()
  - sun3fb_init_fb() returns void (it returns int in the m68k tree)

diff -u --recursive --new-file v2.4.9/linux/drivers/video/sun3fb.c linux/drivers/video/sun3fb.c
--- v2.4.9/linux/drivers/video/sun3fb.c	Thu Apr 26 22:17:27 2001
+++ linux/drivers/video/sun3fb.c	Mon Sep 17 22:52:35 2001
@@ -586,9 +586,11 @@
 	fb->cursor.hwsize.fbx = 32;
 	fb->cursor.hwsize.fby = 32;
 	
-	if (depth > 1 && !fb->color_map)
+	if (depth > 1 && !fb->color_map) {
 		fb->color_map = kmalloc(256 * 3, GFP_ATOMIC);
-		
+		return -ENOMEM;
+	}
+			
 	switch(fbtype) {
 #ifdef CONFIG_FB_CGSIX
 	case FBTYPE_SUNFAST_COLOR:

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds