diff options
Diffstat (limited to 'drivers/video/savage/savagefb_driver.c')
-rw-r--r-- | drivers/video/savage/savagefb_driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index 461e094e7b45..82b3deaae02d 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
@@ -2323,24 +2323,24 @@ static void __devexit savagefb_remove(struct pci_dev *dev) | |||
2323 | } | 2323 | } |
2324 | } | 2324 | } |
2325 | 2325 | ||
2326 | static int savagefb_suspend(struct pci_dev* dev, pm_message_t state) | 2326 | static int savagefb_suspend(struct pci_dev *dev, pm_message_t mesg) |
2327 | { | 2327 | { |
2328 | struct fb_info *info = pci_get_drvdata(dev); | 2328 | struct fb_info *info = pci_get_drvdata(dev); |
2329 | struct savagefb_par *par = info->par; | 2329 | struct savagefb_par *par = info->par; |
2330 | 2330 | ||
2331 | DBG("savagefb_suspend"); | 2331 | DBG("savagefb_suspend"); |
2332 | 2332 | ||
2333 | 2333 | if (mesg.event == PM_EVENT_PRETHAW) | |
2334 | par->pm_state = state.event; | 2334 | mesg.event = PM_EVENT_FREEZE; |
2335 | par->pm_state = mesg.event; | ||
2336 | dev->dev.power.power_state = mesg; | ||
2335 | 2337 | ||
2336 | /* | 2338 | /* |
2337 | * For PM_EVENT_FREEZE, do not power down so the console | 2339 | * For PM_EVENT_FREEZE, do not power down so the console |
2338 | * can remain active. | 2340 | * can remain active. |
2339 | */ | 2341 | */ |
2340 | if (state.event == PM_EVENT_FREEZE) { | 2342 | if (mesg.event == PM_EVENT_FREEZE) |
2341 | dev->dev.power.power_state = state; | ||
2342 | return 0; | 2343 | return 0; |
2343 | } | ||
2344 | 2344 | ||
2345 | acquire_console_sem(); | 2345 | acquire_console_sem(); |
2346 | fb_set_suspend(info, 1); | 2346 | fb_set_suspend(info, 1); |
@@ -2353,7 +2353,7 @@ static int savagefb_suspend(struct pci_dev* dev, pm_message_t state) | |||
2353 | savage_disable_mmio(par); | 2353 | savage_disable_mmio(par); |
2354 | pci_save_state(dev); | 2354 | pci_save_state(dev); |
2355 | pci_disable_device(dev); | 2355 | pci_disable_device(dev); |
2356 | pci_set_power_state(dev, pci_choose_state(dev, state)); | 2356 | pci_set_power_state(dev, pci_choose_state(dev, mesg)); |
2357 | release_console_sem(); | 2357 | release_console_sem(); |
2358 | 2358 | ||
2359 | return 0; | 2359 | return 0; |