Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5511142870046a7bed947d51ec9b320856ee120a
Commit:     5511142870046a7bed947d51ec9b320856ee120a
Parent:     b21010ed6498391c0f359f2a89c907533fe07fec
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Thu Sep 6 09:50:30 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Fri Sep 7 18:44:35 2007 +0200

    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 <[EMAIL PROTECTED]>
---
 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 7e427b4..e14c1ca 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;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to