summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Tholen <obiwan@mailmij.org>2006-08-27 01:23:29 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-27 11:01:28 -0700
commit7334bb4ae931159384acf168eacb0d5d6e0d083c (patch)
treeacbe6d8634e526c90fa73fc2f44f50f179fcf82f
parenta2e0b56316fa90e137802fdad6a7c6a9b85c86c3 (diff)
downloadop-kernel-dev-7334bb4ae931159384acf168eacb0d5d6e0d083c.zip
op-kernel-dev-7334bb4ae931159384acf168eacb0d5d6e0d083c.tar.gz
[PATCH] 1394: fix for recently added firewire patch that breaks things on ppc
Recently a patch was added for preliminary suspend/resume handling on !PPC_PMAC. However, this broke both suspend and firewire on powerpc because it saves the pci state after the device has already been disabled. This moves the save state to before the pmac specific code. Signed-off-by: Danny Tholen <obiwan@mailmij.org> Cc: Stefan Richter <stefanr@s5r6.in-berlin.de> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Ben Collins <bcollins@ubuntu.com> Cc: Jody McIntyre <scjody@modernduck.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/ieee1394/ohci1394.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index d4bad67..448df27 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/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;
}
OpenPOWER on IntegriCloud