diff options
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r-- | drivers/net/wireless/airo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index abf896a7390e..4331d675fcc6 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -4806,7 +4806,7 @@ static int airo_config_commit(struct net_device *dev, | |||
4806 | 4806 | ||
4807 | static inline int sniffing_mode(struct airo_info *ai) | 4807 | static inline int sniffing_mode(struct airo_info *ai) |
4808 | { | 4808 | { |
4809 | return le16_to_cpu(ai->config.rmode & RXMODE_MASK) >= | 4809 | return (le16_to_cpu(ai->config.rmode) & le16_to_cpu(RXMODE_MASK)) >= |
4810 | le16_to_cpu(RXMODE_RFMON); | 4810 | le16_to_cpu(RXMODE_RFMON); |
4811 | } | 4811 | } |
4812 | 4812 | ||
@@ -5659,7 +5659,8 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
5659 | 5659 | ||
5660 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); | 5660 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); |
5661 | pci_save_state(pdev); | 5661 | pci_save_state(pdev); |
5662 | return pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 5662 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
5663 | return 0; | ||
5663 | } | 5664 | } |
5664 | 5665 | ||
5665 | static int airo_pci_resume(struct pci_dev *pdev) | 5666 | static int airo_pci_resume(struct pci_dev *pdev) |