]> git.karo-electronics.de Git - karo-tx-linux.git/commit
firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression)
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 11 Sep 2007 12:59:17 +0000 (14:59 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 26 Sep 2007 17:54:40 +0000 (10:54 -0700)
commit406d6c2a1515d7c38325cdfa4159319e3374a599
treee7ecfc37d336748f5931668a8bb98a0778154efe
parentd35d77999e8609d8d8f9fddb379e70bdf24624c8
firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression)

Minor regression since 2.6.22-rc1:  If the experimental firewire-ohci
driver instead of ohci1394 was loaded, iBook G3 and older PowerBooks
refused to suspend.

Same as commit 5511142870046a7bed947d51ec9b320856ee120a plus format
string touch-ups from 8a8cea2734808522f02941ea16125810ee42c9c7,
"firewire: missing newline in printk".  Original patch description:

Fixes (papers over) "Sleep problems with kernels >= 2.6.21 on powerpc",
http://lkml.org/lkml/2007/8/25/155.  The issue is that the FireWire
controller's pci_dev.current_state of iBook G3 and presumably older
PowerBooks is still in PCI_UNKNOWN instead of PCI_D0 when the firewire
driver's .suspend method is called.

Like it was suggested earlier in http://lkml.org/lkml/2006/10/24/13, we
do not fail .suspend anymore if pci_set_power_state failed.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/firewire/fw-ohci.c