Skip to content

Commit

Permalink
PCI/PM: Clear state_saved during suspend
Browse files Browse the repository at this point in the history
This patch clears pci_dev->state_saved at the beginning of suspending.
PCI config state may be saved long before that.  Some drivers call
pci_save_state() from the ->probe() callback to get snapshot of sane
configuration space to use in the ->slot_reset() callback.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> # add comment
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Rafael J. Wysocki authored and Bjorn Helgaas committed Feb 12, 2013
1 parent cc7ba39 commit 82fee4d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/pci/pci-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ static int pci_pm_suspend(struct device *dev)
goto Fixup;
}

pci_dev->state_saved = false;
if (pm->suspend) {
pci_power_t prev = pci_dev->current_state;
int error;
Expand Down Expand Up @@ -774,6 +775,7 @@ static int pci_pm_freeze(struct device *dev)
return 0;
}

pci_dev->state_saved = false;
if (pm->freeze) {
int error;

Expand Down Expand Up @@ -862,6 +864,7 @@ static int pci_pm_poweroff(struct device *dev)
goto Fixup;
}

pci_dev->state_saved = false;
if (pm->poweroff) {
int error;

Expand Down Expand Up @@ -987,6 +990,7 @@ static int pci_pm_runtime_suspend(struct device *dev)
if (!pm || !pm->runtime_suspend)
return -ENOSYS;

pci_dev->state_saved = false;
pci_dev->no_d3cold = false;
error = pm->runtime_suspend(dev);
suspend_report_result(pm->runtime_suspend, error);
Expand Down

0 comments on commit 82fee4d

Please sign in to comment.