diff options
| author |   Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-14 09:46:46 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-06-18 00:29:10 -0700 |
| commit | 6905b1f1a03a48dcf115a2927f7b87dba8d5e566 (patch) | |
| tree | ef1a52ca05bf55e5b1e55bd3502b1f7295ac9bf1 /drivers/net/e100.c | |
| parent | TI DaVinci EMAC : Fix rmmod error (diff) | |
| download | linux-dev-6905b1f1a03a48dcf115a2927f7b87dba8d5e566.tar.xz linux-dev-6905b1f1a03a48dcf115a2927f7b87dba8d5e566.zip | |
Net / e100: Fix suspend of devices that cannot be power managed
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index f7929e89eb03..efa680f4b8dd 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2895,12 +2895,13 @@ static void __e100_shutdown(struct pci_dev *pdev, bool *enable_wake) 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 |