The patch titled
1394: fix for recently added firewire patch that breaks things on ppc
has been removed from the -mm tree. Its filename is
fix-for-recently-added-firewire-patch-that-breaks-things-on-ppc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: 1394: fix for recently added firewire patch that breaks things on ppc
From: Danny Tholen <obiwan@xxxxxxxxxxx>
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@xxxxxxxxxxx>
Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/ohci1394.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/ieee1394/ohci1394.c~fix-for-recently-added-firewire-patch-that-breaks-things-on-ppc drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/ohci1394.c~fix-for-recently-added-firewire-patch-that-breaks-things-on-ppc
+++ a/drivers/ieee1394/ohci1394.c
@@ -3552,6 +3552,8 @@ static int ohci1394_pci_resume (struct p
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
}
#endif
- pci_save_state(pdev);
-
return 0;
}
_
Patches currently in -mm which might be from obiwan@xxxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
