diff options
Diffstat (limited to 'drivers/video/vt8623fb.c')
| -rw-r--r-- | drivers/video/vt8623fb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 85d76ec4c63..a2965ab92cf 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/svga.h> | 23 | #include <linux/svga.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/console.h> /* Why should fb driver call console functions? because acquire_console_sem() */ | 26 | #include <linux/console.h> /* Why should fb driver call console functions? because console_lock() */ |
| 27 | #include <video/vga.h> | 27 | #include <video/vga.h> |
| 28 | 28 | ||
| 29 | #ifdef CONFIG_MTRR | 29 | #ifdef CONFIG_MTRR |
| @@ -819,12 +819,12 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state) | |||
| 819 | 819 | ||
| 820 | dev_info(info->device, "suspend\n"); | 820 | dev_info(info->device, "suspend\n"); |
| 821 | 821 | ||
| 822 | acquire_console_sem(); | 822 | console_lock(); |
| 823 | mutex_lock(&(par->open_lock)); | 823 | mutex_lock(&(par->open_lock)); |
| 824 | 824 | ||
| 825 | if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) { | 825 | if ((state.event == PM_EVENT_FREEZE) || (par->ref_count == 0)) { |
| 826 | mutex_unlock(&(par->open_lock)); | 826 | mutex_unlock(&(par->open_lock)); |
| 827 | release_console_sem(); | 827 | console_unlock(); |
| 828 | return 0; | 828 | return 0; |
| 829 | } | 829 | } |
| 830 | 830 | ||
| @@ -835,7 +835,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state) | |||
| 835 | pci_set_power_state(dev, pci_choose_state(dev, state)); | 835 | pci_set_power_state(dev, pci_choose_state(dev, state)); |
| 836 | 836 | ||
| 837 | mutex_unlock(&(par->open_lock)); | 837 | mutex_unlock(&(par->open_lock)); |
| 838 | release_console_sem(); | 838 | console_unlock(); |
| 839 | 839 | ||
| 840 | return 0; | 840 | return 0; |
| 841 | } | 841 | } |
| @@ -850,7 +850,7 @@ static int vt8623_pci_resume(struct pci_dev* dev) | |||
| 850 | 850 | ||
| 851 | dev_info(info->device, "resume\n"); | 851 | dev_info(info->device, "resume\n"); |
| 852 | 852 | ||
| 853 | acquire_console_sem(); | 853 | console_lock(); |
| 854 | mutex_lock(&(par->open_lock)); | 854 | mutex_lock(&(par->open_lock)); |
| 855 | 855 | ||
| 856 | if (par->ref_count == 0) | 856 | if (par->ref_count == 0) |
| @@ -869,7 +869,7 @@ static int vt8623_pci_resume(struct pci_dev* dev) | |||
| 869 | 869 | ||
| 870 | fail: | 870 | fail: |
| 871 | mutex_unlock(&(par->open_lock)); | 871 | mutex_unlock(&(par->open_lock)); |
| 872 | release_console_sem(); | 872 | console_unlock(); |
| 873 | 873 | ||
| 874 | return 0; | 874 | return 0; |
| 875 | } | 875 | } |
