diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /drivers/video/chipsfb.c | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/chipsfb.c')
| -rw-r--r-- | drivers/video/chipsfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c index 6796ba62c3c6..777389c40988 100644 --- 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) | |||
| 459 | 459 | ||
| 460 | if (state.event == pdev->dev.power.power_state.event) | 460 | if (state.event == pdev->dev.power.power_state.event) |
| 461 | return 0; | 461 | return 0; |
| 462 | if (state.event != PM_EVENT_SUSPEND) | 462 | if (!(state.event & PM_EVENT_SLEEP)) |
| 463 | goto done; | 463 | goto done; |
| 464 | 464 | ||
| 465 | acquire_console_sem(); | 465 | acquire_console_sem(); |