diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-09-06 09:50:30 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-09-07 18:44:35 +0200 |
| commit | 5511142870046a7bed947d51ec9b320856ee120a (patch) | |
| tree | 288105167ab620dddca35e35b20a4c94431387ca /drivers/firewire | |
| parent | b21010ed6498391c0f359f2a89c907533fe07fec (diff) | |
| download | kernel-crypto-5511142870046a7bed947d51ec9b320856ee120a.tar.gz kernel-crypto-5511142870046a7bed947d51ec9b320856ee120a.tar.xz kernel-crypto-5511142870046a7bed947d51ec9b320856ee120a.zip | |
firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression)
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>
Diffstat (limited to 'drivers/firewire')
| -rw-r--r-- | drivers/firewire/fw-ohci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 7e427b4c74b..e14c1ca7813 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c @@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state) return err; } err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); - if (err) { - fw_error("pci_set_power_state failed\n"); - return err; - } + if (err) + fw_error("pci_set_power_state failed with %d\n", err); return 0; } |