The patch titled
e100: fix suspend of devices that cannot be power managed
has been added to the -mm tree. Its filename is
net-e100-fix-suspend-of-devices-that-cannot-be-power-managed.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: e100: fix suspend of devices that cannot be power managed
From: Rafael J. Wysocki <rjw@xxxxxxx>
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@xxxxxxx>
Acked-by: Andreas Mohr <andi@xxxxxxxx>
Cc: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Cc: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Cc: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Cc: PJ Waskiewicz <peter.p.waskiewicz.jr@xxxxxxxxx>
Cc: John Ronciak <john.ronciak@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/e100.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff -puN drivers/net/e100.c~net-e100-fix-suspend-of-devices-that-cannot-be-power-managed drivers/net/e100.c
--- a/drivers/net/e100.c~net-e100-fix-suspend-of-devices-that-cannot-be-power-managed
+++ a/drivers/net/e100.c
@@ -2895,12 +2895,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
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
linux-next.patch
net-e100-fix-suspend-of-devices-that-cannot-be-power-managed.patch
drivers-rtc-rtc-cmosc-cmos_init-dont-ignore-pnp_register_driver-return-value.patch
mm-pm-freezer-disable-oom-killer-when-tasks-are-frozen.patch
shrink_slab-handle-bad-shrinkers.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
