---

yaml --- r: 130798 b: refs/heads/master c: 48f67f5 h: refs/heads/master v: v3
git-mirror · Jan 27, 2009 · 0c6399d · 0c6399d
1 parent 4355b0e
commit 0c6399d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);
 }
 
 /**