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 branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
nvidia
/
nvidia.c
diff --git
a/drivers/video/nvidia/nvidia.c
b/drivers/video/nvidia/nvidia.c
index
efe10ff
..
081dc47
100644
(file)
--- a/
drivers/video/nvidia/nvidia.c
+++ b/
drivers/video/nvidia/nvidia.c
@@
-1057,7
+1057,7
@@
static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
if (mesg.event == PM_EVENT_PRETHAW)
mesg.event = PM_EVENT_FREEZE;
if (mesg.event == PM_EVENT_PRETHAW)
mesg.event = PM_EVENT_FREEZE;
-
acquire_console_sem
();
+
console_lock
();
par->pm_state = mesg.event;
if (mesg.event & PM_EVENT_SLEEP) {
par->pm_state = mesg.event;
if (mesg.event & PM_EVENT_SLEEP) {
@@
-1070,7
+1070,7
@@
static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
}
dev->dev.power.power_state = mesg;
}
dev->dev.power.power_state = mesg;
-
release_console_sem
();
+
console_unlock
();
return 0;
}
return 0;
}
@@
-1079,7
+1079,7
@@
static int nvidiafb_resume(struct pci_dev *dev)
struct fb_info *info = pci_get_drvdata(dev);
struct nvidia_par *par = info->par;
struct fb_info *info = pci_get_drvdata(dev);
struct nvidia_par *par = info->par;
-
acquire_console_sem
();
+
console_lock
();
pci_set_power_state(dev, PCI_D0);
if (par->pm_state != PM_EVENT_FREEZE) {
pci_set_power_state(dev, PCI_D0);
if (par->pm_state != PM_EVENT_FREEZE) {
@@
-1097,7
+1097,7
@@
static int nvidiafb_resume(struct pci_dev *dev)
nvidiafb_blank(FB_BLANK_UNBLANK, info);
fail:
nvidiafb_blank(FB_BLANK_UNBLANK, info);
fail:
-
release_console_sem
();
+
console_unlock
();
return 0;
}
#else
return 0;
}
#else