From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
pm list <linux-pm@lists.linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
Linux PCI <linux-pci@vger.kernel.org>
Subject: [PATCH 2/7] PCI PM: Check if the state has been saved before trying to restore it
Date: Wed, 4 Feb 2009 01:57:22 +0100 [thread overview]
Message-ID: <200902040157.23385.rjw@sisk.pl> (raw)
In-Reply-To: <200902040154.36018.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
Check if the standard configuration registers of a PCI device have
been saved during suspend before trying to restore them during
resume.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-By: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/pci/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/drivers/pci/pci.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci.c
+++ linux-2.6/drivers/pci/pci.c
@@ -1421,7 +1421,7 @@ int pci_restore_standard_config(struct p
dev->current_state = PCI_D0;
Restore:
- return pci_restore_state(dev);
+ return dev->state_saved ? pci_restore_state(dev) : 0;
}
/**
next prev parent reply other threads:[~2009-02-04 1:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 0:54 [PATCH 0/7] PCI PM: Fixes and refinements Rafael J. Wysocki
2009-02-04 0:56 ` [PATCH 1/7] PCI PM: Fix handling of devices without drivers Rafael J. Wysocki
2009-02-04 1:53 ` Benjamin Herrenschmidt
2009-02-04 2:23 ` Linus Torvalds
2009-02-04 2:49 ` Benjamin Herrenschmidt
2009-02-04 12:12 ` Rafael J. Wysocki
2009-02-04 12:10 ` Rafael J. Wysocki
2009-02-04 0:57 ` Rafael J. Wysocki [this message]
2009-02-04 1:54 ` [PATCH 2/7] PCI PM: Check if the state has been saved before trying to restore it Benjamin Herrenschmidt
2009-02-04 0:59 ` [PATCH 3/7] PCI PM: Fix saving of device state in pci_legacy_suspend Rafael J. Wysocki
2009-02-04 1:56 ` Benjamin Herrenschmidt
2009-02-04 10:14 ` Frans Pop
2009-02-04 21:38 ` Benjamin Herrenschmidt
2009-02-04 21:53 ` Frans Pop
2009-02-04 21:56 ` Linus Torvalds
2009-02-05 0:40 ` Benjamin Herrenschmidt
2009-02-05 0:57 ` Michael Ellerman
2009-02-05 1:29 ` Benjamin Herrenschmidt
2009-02-05 2:58 ` Michael Ellerman
2009-02-05 4:06 ` Benjamin Herrenschmidt
2009-02-04 1:00 ` [PATCH 4/7] PCI PCIe portdrv: Simplify suspend and resume Rafael J. Wysocki
2009-02-04 1:01 ` [PATCH 5/7] PCI PM: Do not disable and enable bridges during suspend-resume Rafael J. Wysocki
2009-02-04 1:02 ` [PATCH 6/7] PCI PM: Read power state from device after trying to change it on resume Rafael J. Wysocki
2009-02-04 1:09 ` [PATCH 7/7] PCI PM: Let the core be more careful with respect to drivers using new framework Rafael J. Wysocki
2009-02-04 2:05 ` Benjamin Herrenschmidt
2009-02-05 0:47 ` Rafael J. Wysocki
2009-02-05 1:18 ` Benjamin Herrenschmidt
2009-02-05 1:23 ` [PATCH 0/7] PCI PM: Fixes and refinements Jesse Barnes
2009-02-05 1:48 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200902040157.23385.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=benh@kernel.crashing.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox