]> git.baikalelectronics.ru Git - kernel.git/commit
[PATCH] 1394: fix for recently added firewire patch that breaks things on ppc
authorDanny Tholen <obiwan@mailmij.org>
Sun, 27 Aug 2006 08:23:29 +0000 (01:23 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 27 Aug 2006 18:01:28 +0000 (11:01 -0700)
commita205525c8a4a124d895074a62ce7a1b856665926
treeacbe6d8634e526c90fa73fc2f44f50f179fcf82f
parent44c4fe10f1f0f25d888ff5b6c60c794a5c9f0bfb
[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>
drivers/ieee1394/ohci1394.c