diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:36 -0700 |
| commit | 9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (patch) | |
| tree | 292b71ae99b8ad8d699237d6fc8b718636ef5f2d /drivers/video/savage | |
| parent | 0370affeec3e751412e917aab931d8ba52680578 (diff) | |
| download | linux-9bfd354b1b9c2f4faee121892bdfbc1490b51ab5.tar.bz2 | |
[PATCH] fix u32 vs. pm_message_t in driver/video
This fixes u32 vs. pm_message_t confusion in drivers/video. Should change no
code.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/savage')
| -rw-r--r-- | drivers/video/savage/savagefb_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index e1c9c946be2d..5bb8d60f35c4 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c @@ -2103,7 +2103,7 @@ static void __devexit savagefb_remove (struct pci_dev *dev) } } -static int savagefb_suspend (struct pci_dev* dev, u32 state) +static int savagefb_suspend (struct pci_dev* dev, pm_message_t state) { struct fb_info *info = (struct fb_info *)pci_get_drvdata(dev); @@ -2118,7 +2118,7 @@ static int savagefb_suspend (struct pci_dev* dev, u32 state) release_console_sem(); pci_disable_device(dev); - pci_set_power_state(dev, state); + pci_set_power_state(dev, pci_choose_state(dev, state)); return 0; } |