diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /drivers/video/nvidia/nvidia.c | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
| -rw-r--r-- | drivers/video/nvidia/nvidia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index 74517b1b26a6..596652d2831f 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
| @@ -1066,7 +1066,7 @@ static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg) | |||
| 1066 | acquire_console_sem(); | 1066 | acquire_console_sem(); |
| 1067 | par->pm_state = mesg.event; | 1067 | par->pm_state = mesg.event; |
| 1068 | 1068 | ||
| 1069 | if (mesg.event == PM_EVENT_SUSPEND) { | 1069 | if (mesg.event & PM_EVENT_SLEEP) { |
| 1070 | fb_set_suspend(info, 1); | 1070 | fb_set_suspend(info, 1); |
| 1071 | nvidiafb_blank(FB_BLANK_POWERDOWN, info); | 1071 | nvidiafb_blank(FB_BLANK_POWERDOWN, info); |
| 1072 | nvidia_write_regs(par, &par->SavedReg); | 1072 | nvidia_write_regs(par, &par->SavedReg); |