sisfb: fix regression with uninitalized fb_info->mm_lock mutex
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Mon, 6 Jul 2009 19:11:24 +0000 (21:11 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Jul 2009 20:44:37 +0000 (13:44 -0700)
Remove redundant call to the sisfb_get_fix() before sis 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>
Tested-by: Wu Zhangjin <wuzhangjin@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/sis/sis_main.c

index fd33455389b89956d4541d76a525d4137d909975..4a067f0d0ceb49135dc3ef2c53f728600c6c8f18 100644 (file)
@@ -6367,7 +6367,6 @@ error_3:  vfree(ivideo->bios_abase);
                sis_fb_info->fix = ivideo->sisfb_fix;
                sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset;
                sis_fb_info->fbops = &sisfb_ops;
-               sisfb_get_fix(&sis_fb_info->fix, -1, sis_fb_info);
                sis_fb_info->pseudo_palette = ivideo->pseudo_palette;
 
                fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0);