]> git.karo-electronics.de Git - karo-tx-linux.git/commit
1394: fix for recently added firewire patch that breaks things on ppc
authorDanny Tholen <obiwan@mailmij.org>
Wed, 23 Aug 2006 17:28:41 +0000 (19:28 +0200)
committerAdrian Bunk <bunk@stusta.de>
Wed, 23 Aug 2006 17:28:41 +0000 (19:28 +0200)
commit13ade36f520a85babd05c36fb7e70c1ef5e570be
tree99a4c34f8cc671edf41fbefb07eed43ef47242d5
parent28ea23d9847cadc58edf3d10b8c1651f18b8d26b
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>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
drivers/ieee1394/ohci1394.c