diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/airo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index d72e0385e4f2..180968899cad 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -1209,7 +1209,7 @@ struct airo_info { | |||
1209 | unsigned char __iomem *pciaux; | 1209 | unsigned char __iomem *pciaux; |
1210 | unsigned char *shared; | 1210 | unsigned char *shared; |
1211 | dma_addr_t shared_dma; | 1211 | dma_addr_t shared_dma; |
1212 | int power; | 1212 | pm_message_t power; |
1213 | SsidRid *SSID; | 1213 | SsidRid *SSID; |
1214 | APListRid *APList; | 1214 | APListRid *APList; |
1215 | #define PCI_SHARED_LEN 2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE | 1215 | #define PCI_SHARED_LEN 2*MPI_MAX_FIDS*PKTSIZE+RIDSIZE |
@@ -5499,9 +5499,9 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
5499 | cmd.cmd=HOSTSLEEP; | 5499 | cmd.cmd=HOSTSLEEP; |
5500 | issuecommand(ai, &cmd, &rsp); | 5500 | issuecommand(ai, &cmd, &rsp); |
5501 | 5501 | ||
5502 | pci_enable_wake(pdev, state, 1); | 5502 | pci_enable_wake(pdev, pci_choose_state(pdev, state), 1); |
5503 | pci_save_state(pdev); | 5503 | pci_save_state(pdev); |
5504 | return pci_set_power_state(pdev, state); | 5504 | return pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
5505 | } | 5505 | } |
5506 | 5506 | ||
5507 | static int airo_pci_resume(struct pci_dev *pdev) | 5507 | static int airo_pci_resume(struct pci_dev *pdev) |
@@ -5512,7 +5512,7 @@ static int airo_pci_resume(struct pci_dev *pdev) | |||
5512 | 5512 | ||
5513 | pci_set_power_state(pdev, 0); | 5513 | pci_set_power_state(pdev, 0); |
5514 | pci_restore_state(pdev); | 5514 | pci_restore_state(pdev); |
5515 | pci_enable_wake(pdev, ai->power, 0); | 5515 | pci_enable_wake(pdev, pci_choose_state(pdev, ai->power), 0); |
5516 | 5516 | ||
5517 | if (ai->power > 1) { | 5517 | if (ai->power > 1) { |
5518 | reset_card(dev, 0); | 5518 | reset_card(dev, 0); |
@@ -5541,7 +5541,7 @@ static int airo_pci_resume(struct pci_dev *pdev) | |||
5541 | } | 5541 | } |
5542 | writeConfigRid(ai, 0); | 5542 | writeConfigRid(ai, 0); |
5543 | enable_MAC(ai, &rsp, 0); | 5543 | enable_MAC(ai, &rsp, 0); |
5544 | ai->power = 0; | 5544 | ai->power = PMSG_ON; |
5545 | netif_device_attach(dev); | 5545 | netif_device_attach(dev); |
5546 | netif_wake_queue(dev); | 5546 | netif_wake_queue(dev); |
5547 | enable_interrupts(ai); | 5547 | enable_interrupts(ai); |