diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-29 05:47:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-29 05:47:13 -0400 |
| commit | ed3f2e40f3d438f4a1ec0a898173116cb26f106a (patch) | |
| tree | f50e1c5f5f3511539084d9529e592e3fb0352607 /drivers/net/wireless/airo.c | |
| parent | fb699dfd426a189fe33b91586c15176a75c8aed0 (diff) | |
| parent | bd6b4442ff3cee73f73987cf0c0e66ea677aa075 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 3 |
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) | |||
| 5660 | 5660 | ||
| 5661 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); | 5661 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); |
| 5662 | pci_save_state(pdev); | 5662 | pci_save_state(pdev); |
| 5663 | return pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 5663 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
| 5664 | return 0; | ||
| 5664 | } | 5665 | } |
| 5665 | 5666 | ||
| 5666 | static int airo_pci_resume(struct pci_dev *pdev) | 5667 | static int airo_pci_resume(struct pci_dev *pdev) |