summaryrefslogtreecommitdiffstats
path: root/drivers/video/i810
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2009-07-07 19:07:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 18:19:49 +0200
commit0c8ddf7f8bf770cf49086af85078c4660d387c55 (patch)
treee8cf88b11e514766f232ef11a556f06b1e16e6fc /drivers/video/i810
parentelfcore.h : Fix UML build breakage (diff)
downloadlinux-0c8ddf7f8bf770cf49086af85078c4660d387c55.tar.xz
linux-0c8ddf7f8bf770cf49086af85078c4660d387c55.zip
i810fb: fix regression with uninitalized fb_info->mm_lock mutex
Remove redundant call to the encode_fix() before i810 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/i810')
-rw-r--r--drivers/video/i810/i810_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 71960672d721..5743ea25e818 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -2060,8 +2060,7 @@ static int __devinit i810fb_init_pci (struct pci_dev *dev,
fb_var_to_videomode(&mode, &info->var);
fb_add_videomode(&mode, &info->modelist);
- encode_fix(&info->fix, info);
-
+
i810fb_init_ringbuffer(info);
err = register_framebuffer(info);