aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-core.c
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2007-11-04 17:59:28 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:02:43 -0200
commit0d65cd4f2bfe70872e4218d9d35d37a7000d6739 (patch)
treea3a61f8c40abb299b3fb36d3799efc97aa435a26 /drivers/media/video/saa7134/saa7134-core.c
parent91821ff3f958c16bf84d02258dd79da792c66ca8 (diff)
downloadkernel_samsung_smdk4412-0d65cd4f2bfe70872e4218d9d35d37a7000d6739.zip
kernel_samsung_smdk4412-0d65cd4f2bfe70872e4218d9d35d37a7000d6739.tar.gz
kernel_samsung_smdk4412-0d65cd4f2bfe70872e4218d9d35d37a7000d6739.tar.bz2
V4L/DVB (6667): Fix access to configuration space while in D3
pci_save_state should be called before pci_set_power_state and pci_restore_state after pci_set_power_state Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-core.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 76410f5..40cdec2 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1194,10 +1194,10 @@ static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
if (dev->remote)
saa7134_ir_stop(dev);
- pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state));
pci_save_state(pci_dev);
+ pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state));
- return 0;
+ return 0;
}
static int saa7134_resume(struct pci_dev *pci_dev)
@@ -1205,8 +1205,8 @@ static int saa7134_resume(struct pci_dev *pci_dev)
struct saa7134_dev *dev = pci_get_drvdata(pci_dev);
unsigned long flags;
- pci_restore_state(pci_dev);
pci_set_power_state(pci_dev, PCI_D0);
+ pci_restore_state(pci_dev);
/* Do things that are done in saa7134_initdev ,
except of initializing memory structures.*/