summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbmem.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 09:20:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 09:20:11 -0700
commit6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6 (patch)
tree5f7ca73877e79431e36a96c658120ee89af39b6f /drivers/video/fbmem.c
parent99f5d48b98fb52db6da379c1b1fd6c87438ee45a (diff)
downloadop-kernel-dev-6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6.zip
op-kernel-dev-6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6.tar.gz
Revert "fb: Initialize fb_info mutexes in framebuffer_alloc()"
This reverts commit 4148df9b0f38bdd362dd91d52076926c11cbe5a9. Let's hope that the mm_lock initialization is now correct with all drivers, following Krzysztof's patches. Requested-by: Krzysztof Helt <krzysztof.h1@poczta.fm> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r--drivers/video/fbmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 53eb396..53ea056 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1513,6 +1513,8 @@ register_framebuffer(struct fb_info *fb_info)
if (!registered_fb[i])
break;
fb_info->node = i;
+ mutex_init(&fb_info->lock);
+ mutex_init(&fb_info->mm_lock);
fb_info->dev = device_create(fb_class, fb_info->device,
MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
OpenPOWER on IntegriCloud