提交 d7272e5b 编写于 作者: K Krzysztof Helt 提交者: Linus Torvalds

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 537a1bf0 " fbdev: add mutex for fb_mmap
locking"
Signed-off-by: NKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 f1b9c339
...@@ -1876,7 +1876,6 @@ static int initMatrox2(WPMINFO struct board* b){ ...@@ -1876,7 +1876,6 @@ static int initMatrox2(WPMINFO struct board* b){
} }
matroxfb_init_fix(PMINFO2); matroxfb_init_fix(PMINFO2);
ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase)); ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase));
matroxfb_update_fix(PMINFO2);
/* Normalize values (namely yres_virtual) */ /* Normalize values (namely yres_virtual) */
matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon)); 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 /* And put it into "current" var. Do NOT program hardware yet, or we'll not take over
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册