Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: check saved state before restore

Browse Source 
Without the check, the config space may be filled with zeros. Though
the driver should try to avoid call restoring before saving, but the
pci layer also should check this.

Also removes the existing check in pci_restore_standard_config, since
it's superfluous with the new check in restore_state.

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Alek Du <alek.du@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Alek Du 2009-08-08 08:46:19 +08:00 committed by Jesse Barnes
parent 6c30c53fd5
commit c82f63e411
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pci-driver.c
View File

@ -508,7 +508,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev)
return error; return error;
} }
return pci_dev->state_saved ? pci_restore_state(pci_dev) : 0; return pci_restore_state(pci_dev);
} }
static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev) static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev)

2
drivers/pci/pci.c
View File

@ -846,6 +846,8 @@ pci_restore_state(struct pci_dev *dev)
int i; int i;
u32 val; u32 val;
if (!dev->state_saved)
return 0;
/* PCI Express register must be restored first */ /* PCI Express register must be restored first */
pci_restore_pcie_state(dev); pci_restore_pcie_state(dev);