diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-04 15:56:05 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-11 17:40:27 -0700 |
| commit | 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765 (patch) | |
| tree | d72305b7abc833c3d33c29402d7548e7acbe03c6 /drivers/pci | |
| parent | cc7ba39bab126339d6d525ada07dea5633d71521 (diff) | |
| download | linux-stable-82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765.tar.gz linux-stable-82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765.tar.bz2 linux-stable-82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765.zip | |
PCI/PM: Clear state_saved during suspend
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>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index dc5bdce63f12..f9aa311b9f34 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -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; @@ -774,6 +775,7 @@ static int pci_pm_freeze(struct device *dev) return 0; } + pci_dev->state_saved = false; if (pm->freeze) { int error; @@ -862,6 +864,7 @@ static int pci_pm_poweroff(struct device *dev) goto Fixup; } + pci_dev->state_saved = false; if (pm->poweroff) { int error; @@ -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); |