summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-02-04 01:57:22 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-02-04 17:20:39 -0800
commit144a76bc885ef4852601c66595326e59f12877f8 (patch)
tree87492fce6e91304467c7e2c9407b6795a80ba983 /drivers/pci
parentddb7c9d29fac34626aef2af9f19787a888e4ca9c (diff)
downloadop-kernel-dev-144a76bc885ef4852601c66595326e59f12877f8.zip
op-kernel-dev-144a76bc885ef4852601c66595326e59f12877f8.tar.gz
PCI PM: Check if the state has been saved before trying to restore it
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> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 4880755..87c9042 100644
--- a/drivers/pci/pci.c
+++ b/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;
}
/**
OpenPOWER on IntegriCloud