diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-23 00:03:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-23 00:03:00 +0200 |
| commit | 8400146d0dc03590bba051399e4bb7e1cbf1c010 (patch) | |
| tree | 4c0c88273ff31e5e5f51c10d8727acab460b57ec /drivers/pci/pci-driver.c | |
| parent | 39cf0518d89d1f0af79554457c52adb5b12fa43c (diff) | |
| parent | 3edf2fb9d80a46d6c32ba12547a42419845b4b76 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 0c2ea44ae5e..a7eb7277b10 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -508,7 +508,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) return error; } - return pci_dev->state_saved ? pci_restore_state(pci_dev) : 0; + return pci_restore_state(pci_dev); } static void pci_pm_default_resume_noirq(struct pci_dev *pci_dev) |