summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2009-07-06 21:11:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 13:44:37 -0700
commitcbad1cbb51d92c0b5c3f47ef9dbf125de81fae08 (patch)
treeb711e0873325f5935e259a8e3796c22a6f618956 /drivers/video/sis
parent8e4a718ff38d8539938ec3421935904c27e00c39 (diff)
downloadop-kernel-dev-cbad1cbb51d92c0b5c3f47ef9dbf125de81fae08.zip
op-kernel-dev-cbad1cbb51d92c0b5c3f47ef9dbf125de81fae08.tar.gz
sisfb: fix regression with uninitalized fb_info->mm_lock mutex
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>
Diffstat (limited to 'drivers/video/sis')
-rw-r--r--drivers/video/sis/sis_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index fd33455..4a067f0 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -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);
OpenPOWER on IntegriCloud