summaryrefslogtreecommitdiff
path: root/drivers/video/matrox
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2009-07-07 22:06:48 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 09:19:49 -0700
commitd7272e5bd9ead4389849db9749b8c4dabd459dd1 (patch)
treec6ab8bf22323aff457d484260bd35849312dc34f /drivers/video/matrox
parentf1b9c339bf30c90114b7c8f285d25e67c7080f90 (diff)
downloadlinux-3.10-d7272e5bd9ead4389849db9749b8c4dabd459dd1.tar.gz
linux-3.10-d7272e5bd9ead4389849db9749b8c4dabd459dd1.tar.bz2
linux-3.10-d7272e5bd9ead4389849db9749b8c4dabd459dd1.zip
matroxfb: fix regression with uninitalized fb_info->mm_lock mutex
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@wp.pl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/matrox')
-rw-r--r--drivers/video/matrox/matroxfb_base.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 76bc51b616d..721a87dc8cf 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