From 759d406eaf87878b64e8691ffac4d0201961d279 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 4 Feb 2009 01:57:22 +0100
Subject: [PATCH] --- yaml --- r: 131109 b: refs/heads/master c:
 144a76bc885ef4852601c66595326e59f12877f8 h: refs/heads/master i:   131107:
 7737ba2417faa6e43db0247606214f2bfe8def87 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b034f5915c2f..65b4e129c7c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddb7c9d29fac34626aef2af9f19787a888e4ca9c
+refs/heads/master: 144a76bc885ef4852601c66595326e59f12877f8
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 48807556b47a..87c904233bf5 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1421,7 +1421,7 @@ int pci_restore_standard_config(struct pci_dev *dev)
 	dev->current_state = PCI_D0;
 
  Restore:
-	return pci_restore_state(dev);
+	return dev->state_saved ? pci_restore_state(dev) : 0;
 }
 
 /**