diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-mpeg.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index bd09d16eb..0987d8a8f 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.20 2005/02/10 10:38:05 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.21 2005/02/15 10:51:53 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -400,7 +400,7 @@ void cx8802_fini_common(struct cx8802_dev *dev) /* ----------------------------------------------------------- */ -int cx8802_suspend_common(struct pci_dev *pci_dev, u32 state) +int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state) { struct cx8802_dev *dev = pci_get_drvdata(pci_dev); struct cx88_core *core = dev->core; @@ -424,7 +424,7 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, u32 state) #else pci_save_state(pci_dev); #endif - if (0 != pci_set_power_state(pci_dev, state)) { + if (0 != pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state))) { pci_disable_device(pci_dev); dev->state.disabled = 1; } @@ -440,7 +440,7 @@ int cx8802_resume_common(struct pci_dev *pci_dev) pci_enable_device(pci_dev); dev->state.disabled = 0; } - pci_set_power_state(pci_dev, 0); + pci_set_power_state(pci_dev, PCI_D0); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_restore_state(pci_dev, dev->state.pci_cfg); #else |