From 938de93953097163b4cce2b66fda71ddf51fd764 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Tue, 15 Feb 2005 10:51:53 +0000 Subject: - some powermanagement stuff. - misc fixes. - fixup patch generation control files. --- linux/drivers/media/video/cx88/cx88-mpeg.c | 8 ++++---- linux/drivers/media/video/cx88/cx88-tvaudio.c | 4 ++-- linux/drivers/media/video/cx88/cx88-video.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'linux/drivers/media/video/cx88') 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 diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index a53db7a39..0fdfd7710 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -1,5 +1,5 @@ /* - $Id: cx88-tvaudio.c,v 1.31 2005/02/14 16:30:26 kraxel Exp $ + $Id: cx88-tvaudio.c,v 1.32 2005/02/15 10:51:54 kraxel Exp $ cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver @@ -851,7 +851,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t) } break; case WW_SYSTEM_L_AM: - if (0x0 == mode && (cx_read(AUD_INIT) & 0x04)) { + if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) { t->audmode = V4L2_TUNER_MODE_STEREO; t->rxsubchans |= V4L2_TUNER_SUB_STEREO; } 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 -- cgit v1.2.3