From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: "Jeffrey Kirsher" <jeffrey.t.kirsher@intel.com>
Cc: e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org,
akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
andi@lisas.de
Subject: [PATCH] Net / e100: Fix suspend of devices that cannot be power managed
Date: Sun, 14 Jun 2009 21:46:46 +0200 [thread overview]
Message-ID: <200906142146.47639.rjw@sisk.pl> (raw)
In-Reply-To: <20090614164604.GA19746@rhlx01.hs-esslingen.de>
From: Rafael J. Wysocki <rjw@sisk.pl>
If the adapter is not power-manageable using either ACPI, or the
native PCI PM interface, __e100_power_off() returns error code, which
causes every attempt to suspend to fail, although it should return 0
in such a case. Fix this problem by ignoring the return value of
pci_set_power_state() in __e100_power_off().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Andreas Mohr <andi@lisas.de>
---
drivers/net/e100.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: linux-2.6/drivers/net/e100.c
===================================================================
--- linux-2.6.orig/drivers/net/e100.c
+++ linux-2.6/drivers/net/e100.c
@@ -2759,12 +2759,13 @@ static void __e100_shutdown(struct pci_d
static int __e100_power_off(struct pci_dev *pdev, bool wake)
{
- if (wake) {
+ if (wake)
return pci_prepare_to_sleep(pdev);
- } else {
- pci_wake_from_d3(pdev, false);
- return pci_set_power_state(pdev, PCI_D3hot);
- }
+
+ pci_wake_from_d3(pdev, false);
+ pci_set_power_state(pdev, PCI_D3hot);
+
+ return 0;
}
#ifdef CONFIG_PM
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
next prev parent reply other threads:[~2009-06-14 19:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-28 8:01 [GIT]: Networking David Miller
2008-12-29 10:25 ` Andreas Mohr
2008-12-29 17:17 ` Andrew Morton
2008-12-29 21:09 ` Johannes Berg
2008-12-30 11:05 ` Andreas Mohr
2008-12-29 23:15 ` Jeff Kirsher
2008-12-30 12:07 ` Andreas Mohr
2009-02-28 20:37 ` 2.6.29 e100.c non-MII support status? (Re: [GIT]: Networking) Andreas Mohr
2009-03-01 10:57 ` Jeff Kirsher
2009-03-01 21:24 ` Andreas Mohr
2009-06-02 21:48 ` [PATCH] Add non-MII PHY support to e100 (Re: 2.6.29 e100.c non-MII support status? (Re: [GIT]: Networking)) Andreas Mohr
2009-06-03 6:01 ` e100 kills S2R on my box, plus network drops dead Andreas Mohr
2009-06-03 6:30 ` Andreas Mohr
2009-06-13 19:19 ` [PATCH] Make e100 suspend handler support PCI cards lacking PM capability Andreas Mohr
2009-06-13 22:28 ` Rafael J. Wysocki
2009-06-13 22:45 ` Rafael J. Wysocki
2009-06-14 12:51 ` Andreas Mohr
2009-06-14 14:06 ` Rafael J. Wysocki
2009-06-14 16:31 ` Rafael J. Wysocki
2009-06-14 16:46 ` Andreas Mohr
2009-06-14 17:09 ` Rafael J. Wysocki
2009-06-14 17:20 ` Andreas Mohr
2009-06-19 8:00 ` Andreas Mohr
2009-06-14 19:46 ` Rafael J. Wysocki [this message]
2009-06-18 2:03 ` [PATCH] Net / e100: Fix suspend of devices that cannot be power managed David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200906142146.47639.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=akpm@linux-foundation.org \
--cc=andi@lisas.de \
--cc=e1000-devel@lists.sourceforge.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).