[Linux-fbdev-devel] [PATCH] matroxfb dies when you try to use secondary head in 2.5.x

[Petr V. <van...@vc...>]

Hi Linus,
   please apply this to 2.5.20. James introduced bad bug which
causes NULL pointer dereference as soon as you'll try to use
secondary head because of screen_base is not initialized
(it is initialized on wrong head).
				Thanks,
					Petr Vandrovec
					van...@vc...


diff -urdN linux/drivers/video/matrox/matroxfb_crtc2.c linux/drivers/video/matrox/matroxfb_crtc2.c
--- linux/drivers/video/matrox/matroxfb_crtc2.c	Mon Jun  3 01:44:45 2002
+++ linux/drivers/video/matrox/matroxfb_crtc2.c	Fri Jun  7 23:03:07 2002
@@ -383,7 +383,7 @@
 		chgvar = 0;
 	p->var = *var;
 	/* cmap */
-	ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(m2info->video.vbase);
+	m2info->fbcon.screen_base = vaddr_va(m2info->video.vbase);
 	p->visual = visual;
 	p->ypanstep = 1;
 	p->ywrapstep = 0;