git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
sh_mobile_lcdcfb.c
diff --git
a/drivers/video/sh_mobile_lcdcfb.c
b/drivers/video/sh_mobile_lcdcfb.c
index
bd4840a
..
bf12e53
100644
(file)
--- a/
drivers/video/sh_mobile_lcdcfb.c
+++ b/
drivers/video/sh_mobile_lcdcfb.c
@@
-912,9
+912,9
@@
static int sh_mobile_release(struct fb_info *info, int user)
/* Nothing to reconfigure, when called from fbcon */
if (user) {
-
acquire_console_sem
();
+
console_lock
();
sh_mobile_fb_reconfig(info);
-
release_console_sem
();
+
console_unlock
();
}
mutex_unlock(&ch->open_lock);