From: danny@mailmij.org
To: linux-kernel@vger.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Andrew Morton <akpm@osdl.org>,
linux1394-devel@lists.sourceforge.net
Subject: [PATCH] fix for recently added firewire patch that breaks things on ppc
Date: Fri, 18 Aug 2006 07:21:43 +0200 [thread overview]
Message-ID: <20060818072143.A32418@luna.ellen.dexterslabs.com> (raw)
In-Reply-To: <1155201211.17187.128.camel@localhost.localdomain>; from benh@kernel.crashing.org on Thu, Aug 10, 2006 at 11:13:30AM +0200
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.
Please apply before 2.6.18.
Signed-off-by: Danny Tholen <obiwan at mailmij.org>
--- linux-2.6.17.7/drivers/ieee1394/ohci1394.c~ 2006-08-09 09:00:32.556422070 -0400
+++ linux-2.6.17.7/drivers/ieee1394/ohci1394.c 2006-08-09 09:02:53.546090923 -0400
@@ -3548,6 +3548,8 @@
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 @@
}
#endif
- pci_save_state(pdev);
-
return 0;
}
next parent reply other threads:[~2006-08-18 5:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060805151050.B24484@luna.ellen.dexterslabs.com>
[not found] ` <1155118273.4040.81.camel@localhost.localdomain>
[not found] ` <20060809151226.A31391@luna.ellen.dexterslabs.com>
[not found] ` <1155201211.17187.128.camel@localhost.localdomain>
2006-08-18 5:21 ` danny [this message]
2006-08-18 6:04 ` Stefan Richter
2006-08-18 6:18 ` danny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060818072143.A32418@luna.ellen.dexterslabs.com \
--to=danny@mailmij.org \
--cc=akpm@osdl.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®