summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbsysfs.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-05 17:25:57 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-06 23:02:50 +0200
commit4148df9b0f38bdd362dd91d52076926c11cbe5a9 (patch)
treea3f119761bbadfc37d0544420263f9272f5209c8 /drivers/video/fbsysfs.c
parentcred_guard_mutex: do not return -EINTR to user-space (diff)
downloadlinux-4148df9b0f38bdd362dd91d52076926c11cbe5a9.tar.xz
linux-4148df9b0f38bdd362dd91d52076926c11cbe5a9.zip
fb: Initialize fb_info mutexes in framebuffer_alloc()
This way they'll be properly initialized early enough for users that may touch them before the framebuffer has been registered. Drivers that allocate their fb_info structure some other way (like matrocfb's broken static allocation) need to be fixed up appropriately. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/fbsysfs.c')
-rw-r--r--drivers/video/fbsysfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index d4a2c11d9809..afc04df39a03 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -62,6 +62,9 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
mutex_init(&info->bl_curve_mutex);
#endif
+ mutex_init(&info->lock);
+ mutex_init(&info->mm_lock);
+
return info;
#undef PADDING
#undef BYTES_PER_LONG