diff options
Diffstat (limited to 'drivers/video/i810/i810_main.c')
-rw-r--r-- | drivers/video/i810/i810_main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index a6ca02f2156a..d42edaccb84c 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
@@ -1554,15 +1554,17 @@ static struct fb_ops i810fb_ops __devinitdata = { | |||
1554 | /*********************************************************************** | 1554 | /*********************************************************************** |
1555 | * Power Management * | 1555 | * Power Management * |
1556 | ***********************************************************************/ | 1556 | ***********************************************************************/ |
1557 | static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) | 1557 | static int i810fb_suspend(struct pci_dev *dev, pm_message_t mesg) |
1558 | { | 1558 | { |
1559 | struct fb_info *info = pci_get_drvdata(dev); | 1559 | struct fb_info *info = pci_get_drvdata(dev); |
1560 | struct i810fb_par *par = info->par; | 1560 | struct i810fb_par *par = info->par; |
1561 | 1561 | ||
1562 | par->cur_state = state.event; | 1562 | par->cur_state = mesg.event; |
1563 | 1563 | ||
1564 | if (state.event == PM_EVENT_FREEZE) { | 1564 | switch (mesg.event) { |
1565 | dev->dev.power.power_state = state; | 1565 | case PM_EVENT_FREEZE: |
1566 | case PM_EVENT_PRETHAW: | ||
1567 | dev->dev.power.power_state = mesg; | ||
1566 | return 0; | 1568 | return 0; |
1567 | } | 1569 | } |
1568 | 1570 | ||
@@ -1578,7 +1580,7 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t state) | |||
1578 | 1580 | ||
1579 | pci_save_state(dev); | 1581 | pci_save_state(dev); |
1580 | pci_disable_device(dev); | 1582 | pci_disable_device(dev); |
1581 | pci_set_power_state(dev, pci_choose_state(dev, state)); | 1583 | pci_set_power_state(dev, pci_choose_state(dev, mesg)); |
1582 | release_console_sem(); | 1584 | release_console_sem(); |
1583 | 1585 | ||
1584 | return 0; | 1586 | return 0; |