From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Subject: firewire: fw-ohci: ignore failure of pci_set_power_state (fix suspend regression) Fixes "Sleep problems with kernels >= 2.6.21 on powerpc", http://lkml.org/lkml/2007/8/25/155. 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@xxxxxxxxxxxxxxxxx> --- drivers/firewire/fw-ohci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: linux-2.6.23-rc4/drivers/firewire/fw-ohci.c =================================================================== --- linux-2.6.23-rc4.orig/drivers/firewire/fw-ohci.c +++ linux-2.6.23-rc4/drivers/firewire/fw-ohci.c @@ -1946,8 +1946,11 @@ static int pci_suspend(struct pci_dev *p } err = pci_set_power_state(pdev, pci_choose_state(pdev, state)); if (err) { + /* + * Some Apple onboard controllers are known to fail here. + * Ignore it and let the machine proceed to suspend. + */ fw_error("pci_set_power_state failed\n"); - return err; } return 0; -- Stefan Richter -=====-=-=== =--= --=-= http://arcgraph.de/sr/ _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm
