| From stable-bounces@linux.kernel.org Fri Aug 18 16:11:02 2006 |
| Message-Id: <200608182310.k7INAGU5002770@shell0.pdx.osdl.net> |
| To: mm-commits@vger.kernel.org |
| From: Danny Tholen <obiwan@mailmij.org> |
| Date: Fri, 18 Aug 2006 16:10:16 -0700 |
| Cc: scjody@modernduck.com, bcollins@ubuntu.com, benh@kernel.crashing.org, obiwan@mailmij.org, stefanr@s5r6.in-berlin.de, stable@kernel.org |
| Subject: 1394: fix for recently added firewire patch that breaks things on ppc |
| |
| From: Danny Tholen <obiwan@mailmij.org> |
| |
| 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 | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- linux-2.6.17.9.orig/drivers/ieee1394/ohci1394.c |
| +++ linux-2.6.17.9/drivers/ieee1394/ohci1394.c |
| @@ -3548,6 +3548,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; |
| @@ -3559,8 +3561,6 @@ static int ohci1394_pci_suspend (struct |
| } |
| #endif |
| |
| - pci_save_state(pdev); |
| - |
| return 0; |
| } |
| |
