diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 19:10:45 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 19:10:45 +0300 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /drivers/video/sm501fb.c | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
| download | linux-c9149556756d56c68451a4a8735c37e7062fd3d7.tar.xz | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/video/sm501fb.c')
| -rw-r--r-- | drivers/video/sm501fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index b7dc1800efa9..bcb44a594ebc 100644 --- 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 */ - acquire_console_sem(); + console_lock(); fb_set_suspend(fbi, 1); - release_console_sem(); + console_unlock(); /* 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); - acquire_console_sem(); + console_lock(); fb_set_suspend(fbi, 0); - release_console_sem(); + console_unlock(); vfree(par->store_fb); vfree(par->store_cursor); |