From: Krzysztof Helt Date: Tue, 7 Jul 2009 17:07:57 +0000 (+0200) Subject: i810fb: fix regression with uninitalized fb_info->mm_lock mutex X-Git-Tag: v2.6.31-rc3~65 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0c8ddf7f8bf770cf49086af85078c4660d387c55;hp=e9bf0cc7cbfbf3952cdf8028aa0d348d09ecdba1;p=safe%2Fjmp%2Flinux-2.6 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 Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index 7196067..5743ea2 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);