]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
1394: fix for recently added firewire patch that breaks things on ppc
authorDanny Tholen <obiwan@mailmij.org>
Fri, 18 Aug 2006 23:10:16 +0000 (16:10 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 23 Aug 2006 21:13:32 +0000 (14:13 -0700)
commit338341c1cea5d13428c242c1f624df644c7fb068
treec72383b617db5b0f85d36c546593eb782d9e1d58
parentdc41bfe271fee237ae41e3cbd8b4789b60da3e53
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>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ben Collins <bcollins@ubuntu.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/ieee1394/ohci1394.c