Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756679AbXIESIR (ORCPT ); Wed, 5 Sep 2007 14:08:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753001AbXIESIF (ORCPT ); Wed, 5 Sep 2007 14:08:05 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:45518 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752603AbXIESID (ORCPT ); Wed, 5 Sep 2007 14:08:03 -0400 X-Envelope-From: stefanr@s5r6.in-berlin.de Date: Wed, 5 Sep 2007 20:06:50 +0200 (CEST) From: Stefan Richter Subject: [PATCH] Re: Sleep problems with kernels >= 2.6.21 on powerpc To: Andrew Morton cc: Tim Teulings , michal.k.k.piotrowski@gmail.com, rbrito@gmail.com, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, debian-powerpc@lists.debian.org, rjw@sisk.pl, linux-pm@lists.linux-foundation.org, =?iso-8859-1?Q?Kristian_H=F8gsberg?= In-Reply-To: <46DEEBBE.4070201@s5r6.in-berlin.de> Message-ID: References: <6540c930708251937o2a9a23efv72a0f2b8947067bd@mail.gmail.com> <6bffcb0e0708261621q25316becqce7b3ae2176f45a8@mail.gmail.com> <20070827065246.GA21220@ime.usp.br> <46D279E8.10001@edge.ping.de> <46D72BC6.3020809@edge.ping.de> <20070905100754.57ab4e3e.akpm@linux-foundation.org> <46DEEBBE.4070201@s5r6.in-berlin.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; CHARSET=us-ascii Content-Disposition: INLINE Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1410 Lines: 42 From: Stefan Richter 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 --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/