From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Helgaas , Yijing Wang , Konstantin Khlebnikov Subject: [PATCH 3.4 11/12] PCI/PM: Clear state_saved during suspend Date: Mon, 18 Nov 2013 10:41:44 -0800 Message-Id: <20131118184133.451435120@linuxfoundation.org> In-Reply-To: <20131118184130.257996039@linuxfoundation.org> References: <20131118184130.257996039@linuxfoundation.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Rafael J. Wysocki" commit 82fee4d67ab86d6fe5eb0f9a9e988ca9d654d765 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 # add comment Signed-off-by: Bjorn Helgaas Signed-off-by: Yijing Wang Signed-off-by: Greg Kroah-Hartman --- drivers/pci/pci-driver.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -680,6 +680,7 @@ static int pci_pm_suspend(struct device goto Fixup; } + pci_dev->state_saved = false; if (pm->suspend) { pci_power_t prev = pci_dev->current_state; int error; @@ -826,6 +827,7 @@ static int pci_pm_freeze(struct device * return 0; } + pci_dev->state_saved = false; if (pm->freeze) { int error; @@ -914,6 +916,7 @@ static int pci_pm_poweroff(struct device goto Fixup; } + pci_dev->state_saved = false; if (pm->poweroff) { int error; @@ -1032,6 +1035,7 @@ static int pci_pm_runtime_suspend(struct if (!pm || !pm->runtime_suspend) return -ENOSYS; + pci_dev->state_saved = false; error = pm->runtime_suspend(dev); suspend_report_result(pm->runtime_suspend, error); if (error)