diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:20:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:20:11 -0700 |
| commit | 6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6 (patch) | |
| tree | 5f7ca73877e79431e36a96c658120ee89af39b6f /drivers/video/matrox | |
| parent | 99f5d48b98fb52db6da379c1b1fd6c87438ee45a (diff) | |
| download | kernel-common-6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6.tar.gz kernel-common-6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6.tar.bz2 kernel-common-6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6.zip | |
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/matrox')
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 721a87dc8cfc..0c1049b308bf 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c @@ -2082,7 +2082,6 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm spin_lock_init(&ACCESS_FBINFO(lock.accel)); init_rwsem(&ACCESS_FBINFO(crtc2.lock)); init_rwsem(&ACCESS_FBINFO(altout.lock)); - mutex_init(&ACCESS_FBINFO(fbcon).lock); mutex_init(&ACCESS_FBINFO(fbcon).mm_lock); ACCESS_FBINFO(irq_flags) = 0; init_waitqueue_head(&ACCESS_FBINFO(crtc1.vsync.wait)); |