summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthieu castet <castet.matthieu@free.fr>2009-10-09 22:12:25 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:47:56 -0400
commit40b93ad6e97a1d412c4b86f4717fee9b4bc830e1 (patch)
treed68fc91b4f740b17150aa16ba5985bab9f01d062
parentc32bec78e1af751a279ec1614eadd36aab532e56 (diff)
downloadblackbird-op-linux-40b93ad6e97a1d412c4b86f4717fee9b4bc830e1.tar.gz
blackbird-op-linux-40b93ad6e97a1d412c4b86f4717fee9b4bc830e1.zip
airo : allow supend with card without power management
Some airo card don't support power Management [1]. Don't abort suspend with those cards. 00:06.0 Network controller: AIRONET Wireless Communications PC4800 (rev 01) Flags: medium devsel, IRQ 17 Memory at dffffe00 (32-bit, non-prefetchable) [size=128] I/O ports at d000 [size=128] I/O ports at cc00 [size=64] Kernel driver in use: airo Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/airo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 7116a1aa20ce..e265ba14054b 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -5660,7 +5660,8 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state)
pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
pci_save_state(pdev);
- return pci_set_power_state(pdev, pci_choose_state(pdev, state));
+ pci_set_power_state(pdev, pci_choose_state(pdev, state));
+ return 0;
}
static int airo_pci_resume(struct pci_dev *pdev)
OpenPOWER on IntegriCloud