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 branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...
[pandora-kernel.git]
/
drivers
/
video
/
sm501fb.c
diff --git
a/drivers/video/sm501fb.c
b/drivers/video/sm501fb.c
index
b7dc180
..
bcb44a5
100644
(file)
--- a/
drivers/video/sm501fb.c
+++ b/
drivers/video/sm501fb.c
@@
-2010,9
+2010,9
@@
static int sm501fb_suspend_fb(struct sm501fb_info *info,
/* tell console/fb driver we are suspending */
/* tell console/fb driver we are suspending */
-
acquire_console_sem
();
+
console_lock
();
fb_set_suspend(fbi, 1);
fb_set_suspend(fbi, 1);
-
release_console_sem
();
+
console_unlock
();
/* backup copies in case chip is powered down over suspend */
/* backup copies in case chip is powered down over suspend */
@@
-2069,9
+2069,9
@@
static void sm501fb_resume_fb(struct sm501fb_info *info,
memcpy_toio(par->cursor.k_addr, par->store_cursor,
par->cursor.size);
memcpy_toio(par->cursor.k_addr, par->store_cursor,
par->cursor.size);
-
acquire_console_sem
();
+
console_lock
();
fb_set_suspend(fbi, 0);
fb_set_suspend(fbi, 0);
-
release_console_sem
();
+
console_unlock
();
vfree(par->store_fb);
vfree(par->store_cursor);
vfree(par->store_fb);
vfree(par->store_cursor);