From 0c6399d7a3ab2dfc214c65558a0ee6d242dcb428 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 22 Jan 2009 23:38:31 +0100 Subject: [PATCH] --- yaml --- r: 130798 b: refs/heads/master c: 48f67f54a53bb68619a63c3f38cf7f502ed74b1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c02724df7aa1..62cc18566369 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 545ffd58adc86b8d33449dab44fe81b503a6f81b +refs/heads/master: 48f67f54a53bb68619a63c3f38cf7f502ed74b1d diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 17bd9325a245..f0aa3d533839 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1393,12 +1393,11 @@ int pci_restore_standard_config(struct pci_dev *dev) pci_power_t prev_state; int error; - pci_restore_state(dev); pci_update_current_state(dev, PCI_D0); prev_state = dev->current_state; if (prev_state == PCI_D0) - return 0; + goto Restore; error = pci_raw_set_power_state(dev, PCI_D0, false); if (error) @@ -1421,7 +1420,8 @@ int pci_restore_standard_config(struct pci_dev *dev) dev->current_state = PCI_D0; - return 0; + Restore: + return pci_restore_state(dev); } /**