Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7334bb4a authored by Danny Tholen's avatar Danny Tholen Committed by Linus Torvalds
Browse files

[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: default avatarDanny Tholen <obiwan@mailmij.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ben Collins <bcollins@ubuntu.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a2e0b563

drivers/ieee1394/ohci1394.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}