From e5c92034ad6e180e0ab1d4cffd5966db701c57ee Mon Sep 17 00:00:00 2001 From: Danny Tholen Date: Sun, 27 Aug 2006 01:23:29 -0700 Subject: [PATCH] --- yaml --- r: 33625 b: refs/heads/master c: 7334bb4ae931159384acf168eacb0d5d6e0d083c h: refs/heads/master i: 33623: 7b125e006e4b9fa45c6922bc758beb89ec4c58bb v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d602596654ca..1b5cf4fa6cf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2e0b56316fa90e137802fdad6a7c6a9b85c86c3 +refs/heads/master: 7334bb4ae931159384acf168eacb0d5d6e0d083c diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index d4bad6704bbe..448df2773377 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/drivers/ieee1394/ohci1394.c @@ -3552,6 +3552,8 @@ static int ohci1394_pci_resume (struct pci_dev *pdev) static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) { + pci_save_state(pdev); + #ifdef CONFIG_PPC_PMAC if (machine_is(powermac)) { struct device_node *of_node; @@ -3563,8 +3565,6 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) } #endif - pci_save_state(pdev); - return 0; }