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>
This commit is contained in:
Родитель
cc7ba39bab
Коммит
82fee4d67a
|
@ -628,6 +628,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;
|
||||||
|
@ -774,6 +775,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;
|
||||||
|
|
||||||
|
@ -862,6 +864,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;
|
||||||
|
|
||||||
|
@ -987,6 +990,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;
|
||||||
pci_dev->no_d3cold = false;
|
pci_dev->no_d3cold = 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);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче