matroxfb: fix regression with uninitalized fb_info->mm_lock mutex
From: Krzysztof Helt
Date: Tue Jul 07 2009 - 15:57:18 EST
From: Krzysztof Helt <krzysztof.h1@xxxxx>
Remove redundant call to the matroxfb_update_fix() before matrox frambuffer
is registered.
This fixes a problem with uninitialized the fb_info->mm_lock mutex introduced
by the commit 537a1bf059f " fbdev: add mutex for fb_mmap locking"
Signed-off-by: Krzysztof Helt <krzysztof.h1@xxxxx>
---
This one I have been able to test. It fixed regression with the mm_lock mutex.
It may not fix regression for a second head. I will investigate this issue.
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 76bc51b..721a87d 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1876,7 +1876,6 @@ static int initMatrox2(WPMINFO struct board* b){
}
matroxfb_init_fix(PMINFO2);
ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase));
- matroxfb_update_fix(PMINFO2);
/* Normalize values (namely yres_virtual) */
matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon));
/* And put it into "current" var. Do NOT program hardware yet, or we'll not take over
----------------------------------------------------------------------
Promocja ubezpieczen komunikacyjnych Ergo Hestia. Sprawdz!
http://link.interia.pl/f222f
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/