Commit 17447567 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman

PCI/PM: Clear state_saved during suspend

commit 82fee4d6 upstream.

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.

[wangyj: adjust context]
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> # add comment
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1814ea1
...@@ -680,6 +680,7 @@ static int pci_pm_suspend(struct device *dev) ...@@ -680,6 +680,7 @@ static int pci_pm_suspend(struct device *dev)
goto Fixup; goto Fixup;
} }
pci_dev->state_saved = false;
if (pm->suspend) { if (pm->suspend) {
pci_power_t prev = pci_dev->current_state; pci_power_t prev = pci_dev->current_state;
int error; int error;
...@@ -826,6 +827,7 @@ static int pci_pm_freeze(struct device *dev) ...@@ -826,6 +827,7 @@ static int pci_pm_freeze(struct device *dev)
return 0; return 0;
} }
pci_dev->state_saved = false;
if (pm->freeze) { if (pm->freeze) {
int error; int error;
...@@ -914,6 +916,7 @@ static int pci_pm_poweroff(struct device *dev) ...@@ -914,6 +916,7 @@ static int pci_pm_poweroff(struct device *dev)
goto Fixup; goto Fixup;
} }
pci_dev->state_saved = false;
if (pm->poweroff) { if (pm->poweroff) {
int error; int error;
...@@ -1032,6 +1035,7 @@ static int pci_pm_runtime_suspend(struct device *dev) ...@@ -1032,6 +1035,7 @@ static int pci_pm_runtime_suspend(struct device *dev)
if (!pm || !pm->runtime_suspend) if (!pm || !pm->runtime_suspend)
return -ENOSYS; return -ENOSYS;
pci_dev->state_saved = false;
error = pm->runtime_suspend(dev); error = pm->runtime_suspend(dev);
suspend_report_result(pm->runtime_suspend, error); suspend_report_result(pm->runtime_suspend, error);
if (error) if (error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment