diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2009-07-07 16:06:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 12:19:49 -0400 |
| commit | d7272e5bd9ead4389849db9749b8c4dabd459dd1 (patch) | |
| tree | c6ab8bf22323aff457d484260bd35849312dc34f | |
| parent | f1b9c339bf30c90114b7c8f285d25e67c7080f90 (diff) | |
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>
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 76bc51b616d1..721a87dc8cfc 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){ | |||
| 1876 | } | 1876 | } |
| 1877 | matroxfb_init_fix(PMINFO2); | 1877 | matroxfb_init_fix(PMINFO2); |
| 1878 | ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase)); | 1878 | ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase)); |
| 1879 | matroxfb_update_fix(PMINFO2); | ||
| 1880 | /* Normalize values (namely yres_virtual) */ | 1879 | /* Normalize values (namely yres_virtual) */ |
| 1881 | matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon)); | 1880 | matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon)); |
| 1882 | /* And put it into "current" var. Do NOT program hardware yet, or we'll not take over | 1881 | /* And put it into "current" var. Do NOT program hardware yet, or we'll not take over |