From a6f8d10d995787e6868ec74d86126c7761dc7efd Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Mon, 12 Jun 2006 18:15:03 -0400 Subject: [PATCH] --- yaml --- r: 28139 b: refs/heads/master c: b21efb59c5d317a2a972b9d66939cbfeababd982 h: refs/heads/master i: 28137: dca917f2b409632509182f079a1238f05cd622f3 28135: 80e1637b3d67eadfc587ad0687f9d4f5f987d38d v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 65cc01ef4d87..e3b049123220 100644 --- 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 index c858f5f94d35..96b994bde480 100644 --- 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; }