diff options
| author | Gerd Knorr <devnull@localhost> | 2005-02-15 10:51:53 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-02-15 10:51:53 +0000 |
| commit | 938de93953097163b4cce2b66fda71ddf51fd764 (patch) | |
| tree | 9127195ffeadb470483da8628972db40ad06c974 /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | 3a70b65402065a56decd5b1e43711c98b7d19a6d (diff) | |
| download | mediapointer-dvb-s2-938de93953097163b4cce2b66fda71ddf51fd764.tar.gz mediapointer-dvb-s2-938de93953097163b4cce2b66fda71ddf51fd764.tar.bz2 | |
- some powermanagement stuff.
- misc fixes.
- fixup patch generation control files.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 690ca8990..f115d8564 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.55 2005/02/14 16:30:26 kraxel Exp $ + * $Id: cx88-video.c,v 1.56 2005/02/15 10:51:54 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2168,7 +2168,7 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev) kfree(dev); } -static int cx8800_suspend(struct pci_dev *pci_dev, u32 state) +static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct cx8800_dev *dev = pci_get_drvdata(pci_dev); struct cx88_core *core = dev->core; @@ -2197,7 +2197,7 @@ static int cx8800_suspend(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; } @@ -2213,7 +2213,7 @@ static int cx8800_resume(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 |