projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6]
/
drivers
/
video
/
chipsfb.c
diff --git
a/drivers/video/chipsfb.c
b/drivers/video/chipsfb.c
index
6796ba6
..
777389c
100644
(file)
--- a/
drivers/video/chipsfb.c
+++ b/
drivers/video/chipsfb.c
@@
-459,7
+459,7
@@
static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
if (state.event == pdev->dev.power.power_state.event)
return 0;
- if (
state.event != PM_EVENT_SUSPEND
)
+ if (
!(state.event & PM_EVENT_SLEEP)
)
goto done;
acquire_console_sem();