[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tkrat.7174534bdd0ddaff@s5r6.in-berlin.de>
Date: Wed, 5 Sep 2007 20:06:50 +0200 (CEST)
From: Stefan Richter <stefanr@...6.in-berlin.de>
To: Andrew Morton <akpm@...ux-foundation.org>
cc: Tim Teulings <rael@...e.ping.de>, michal.k.k.piotrowski@...il.com,
rbrito@...il.com, linux-kernel@...r.kernel.org,
linuxppc-dev@...abs.org, debian-powerpc@...ts.debian.org,
rjw@...k.pl, linux-pm@...ts.linux-foundation.org,
Kristian Høgsberg <krh@...hat.com>
Subject: [PATCH] Re: Sleep problems with kernels >= 2.6.21 on powerpc
From: Stefan Richter <stefanr@...6.in-berlin.de>
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@...6.in-berlin.de>
---
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/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists