---

yaml --- r: 28139 b: refs/heads/master c: b21efb5 h: refs/heads/master i: 28137: dca917f 28135: 80e1637 v: v3
git-mirror · Jun 12, 2006 · a6f8d10 · a6f8d10
1 parent 9f93888
commit a6f8d10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05db5055b1844bf39d1429a0c43078959198cd1d
+refs/heads/master: b21efb59c5d317a2a972b9d66939cbfeababd982
diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c
@@ -3547,6 +3547,7 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)
 	}
 #endif /* CONFIG_PPC_PMAC */
 
+	pci_restore_state(pdev);
 	pci_enable_device(pdev);
 
 	return 0;
@@ -3566,6 +3567,8 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 	}
 #endif
 
+	pci_save_state(pdev);
+
 	return 0;
 }