diff options
author | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
commit | 58b8a5b45a097b477c037bc376e65dc5f214bf3d (patch) | |
tree | 9fa2538a113fbd3aaa322d9c972aca3ca16b7e30 /drivers/video/geode/lxfb_core.c | |
parent | ffeb414a59291d5891f09727beb793c109f19f08 (diff) | |
parent | 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/geode/lxfb_core.c')
-rw-r--r-- | drivers/video/geode/lxfb_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c index 39bdbedf43b4..416851ca8754 100644 --- a/drivers/video/geode/lxfb_core.c +++ b/drivers/video/geode/lxfb_core.c @@ -465,10 +465,10 @@ static int lxfb_suspend(struct pci_dev *pdev, pm_message_t state) struct fb_info *info = pci_get_drvdata(pdev); if (state.event == PM_EVENT_SUSPEND) { - acquire_console_sem(); + console_lock(); lx_powerdown(info); fb_set_suspend(info, 1); - release_console_sem(); + console_unlock(); } /* there's no point in setting PCI states; we emulate PCI, so @@ -482,7 +482,7 @@ static int lxfb_resume(struct pci_dev *pdev) struct fb_info *info = pci_get_drvdata(pdev); int ret; - acquire_console_sem(); + console_lock(); ret = lx_powerup(info); if (ret) { printk(KERN_ERR "lxfb: power up failed!\n"); @@ -490,7 +490,7 @@ static int lxfb_resume(struct pci_dev *pdev) } fb_set_suspend(info, 0); - release_console_sem(); + console_unlock(); return 0; } #else |