aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2009-07-08 15:59:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 17:18:35 -0400
commitb5daa70a4a55a807e893fe7f94289c61c50a6e5f (patch)
tree499a08852e7090fb405386aca4ce32e8c9c35226 /drivers/video
parent44b572809581d5a10dbe35aa6bf689f32b9c5ad6 (diff)
fsl-diu-fb: fix regression with uninitalized fb_info->mm_lock mutex
Remove call to the fsl_diu_set_par before the register_framebuffer(). 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: "Kai Jiang" <b18973@freescale.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fsl-diu-fb.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 0bf2190928d0..72d68b3dc478 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1223,12 +1223,6 @@ static int __devinit install_fb(struct fb_info *info)
1223 return -EINVAL; 1223 return -EINVAL;
1224 } 1224 }
1225 1225
1226 if (fsl_diu_set_par(info)) {
1227 printk(KERN_ERR "fb_set_par failed");
1228 fb_dealloc_cmap(&info->cmap);
1229 return -EINVAL;
1230 }
1231
1232 if (register_framebuffer(info) < 0) { 1226 if (register_framebuffer(info) < 0) {
1233 printk(KERN_ERR "register_framebuffer failed"); 1227 printk(KERN_ERR "register_framebuffer failed");
1234 unmap_video_memory(info); 1228 unmap_video_memory(info);