patch-2.1.110 linux/drivers/video/atafb.c

• Lines: 27
• Date: Sat Jul 18 13:55:46 1998
• Orig file: v2.1.109/linux/drivers/video/atafb.c
• Orig date: Thu Jul 16 18:09:27 1998

diff -u --recursive --new-file v2.1.109/linux/drivers/video/atafb.c linux/drivers/video/atafb.c
@@ -2671,7 +2671,7 @@
 			sprintf(default_name,"default%d",i);
 			default_par=get_video_mode(default_name);
 			if (! default_par)
-				panic("can't set default video mode\n");
+				panic("can't set default video mode");
 			var=atafb_predefined[default_par-1];
 			var.activate = FB_ACTIVATE_TEST;
 			if (! do_fb_set_var(&var,1))
@@ -2768,7 +2768,7 @@
 #else /* ATAFB_STE */
 		/* no default driver included */
 		/* Nobody will ever see this message :-) */
-		panic("Cannot initialize video hardware\n");
+		panic("Cannot initialize video hardware");
 #endif
 	} while (0);
 
@@ -2791,6 +2791,8 @@
 		mem_req = ((mem_req + PAGE_SIZE - 1) & PAGE_MASK) + PAGE_SIZE;
 		screen_base = (unsigned long)atari_stram_alloc(mem_req, NULL,
 							       "atafb");
+		if (!screen_base)
+			panic("Cannot allocate screen memory");
 		memset((char *) screen_base, 0, mem_req);
 		pad = ((screen_base + PAGE_SIZE-1) & PAGE_MASK) - screen_base;
 		screen_base+=pad;