diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 05:04:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 05:04:07 -0400 |
| commit | c3144fc46f987413df10e83659f0bf1aad76f79e (patch) | |
| tree | a09f3c13c32664a617d3981ae111436c3127ccc3 /drivers/pci/pci.c | |
| parent | 4f896ffca2b72f4b719746e7fbb0b623252e6ac9 (diff) | |
| parent | cc58f597afc63a57bb55ed97c2a72f7405320c93 (diff) | |
Merge branches 'sh/hwblk' and 'sh/pm-runtime'
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index dbd0f947f497..7b70312181d7 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -846,6 +846,8 @@ pci_restore_state(struct pci_dev *dev) | |||
| 846 | int i; | 846 | int i; |
| 847 | u32 val; | 847 | u32 val; |
| 848 | 848 | ||
| 849 | if (!dev->state_saved) | ||
| 850 | return 0; | ||
| 849 | /* PCI Express register must be restored first */ | 851 | /* PCI Express register must be restored first */ |
| 850 | pci_restore_pcie_state(dev); | 852 | pci_restore_pcie_state(dev); |
| 851 | 853 | ||