diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 12:23:27 +0300 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 12:23:27 +0300 |
commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /drivers/video/via/viafbdev.c | |
parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
download | linux-6b620478e58677bb3f4ec884abb29ef9d68c7821.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'drivers/video/via/viafbdev.c')
-rw-r--r-- | drivers/video/via/viafbdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 289edd519527..4e66349e4366 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -1674,17 +1674,17 @@ static int parse_mode(const char *str, u32 *xres, u32 *yres) #ifdef CONFIG_PM static int viafb_suspend(void *unused) { - acquire_console_sem(); + console_lock(); fb_set_suspend(viafbinfo, 1); viafb_sync(viafbinfo); - release_console_sem(); + console_unlock(); return 0; } static int viafb_resume(void *unused) { - acquire_console_sem(); + console_lock(); if (viaparinfo->shared->vdev->engine_mmio) viafb_reset_engine(viaparinfo); viafb_set_par(viafbinfo); @@ -1692,7 +1692,7 @@ static int viafb_resume(void *unused) viafb_set_par(viafbinfo1); fb_set_suspend(viafbinfo, 0); - release_console_sem(); + console_unlock(); return 0; } |