1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index d72e0385e4f2..c12648d8192b 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -900,7 +900,7 @@ typedef struct aironet_ioctl {
         unsigned char __user *data;     // d-data
 } aironet_ioctl;
 
-static char *swversion = "2.1";
+static char swversion[] = "2.1";
 #endif /* CISCO_EXT */
 
 #define NUM_MODULES       2
@@ -1209,7 +1209,7 @@ struct airo_info {
         unsigned char           __iomem *pciaux;
         unsigned char           *shared;
         dma_addr_t              shared_dma;
-        int                     power;
+        pm_message_t            power;
         SsidRid                 *SSID;
         APListRid               *APList;
 #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)
         cmd.cmd=HOSTSLEEP;
         issuecommand(ai, &cmd, &rsp);
 
-        pci_enable_wake(pdev, state, 1);
+        pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
         pci_save_state(pdev);
-        return pci_set_power_state(pdev, state);
+        return pci_set_power_state(pdev, pci_choose_state(pdev, state));
 }
 
 static int airo_pci_resume(struct pci_dev *pdev)
@@ -5512,7 +5512,7 @@ static int airo_pci_resume(struct pci_dev *pdev)
 
         pci_set_power_state(pdev, 0);
         pci_restore_state(pdev);
-        pci_enable_wake(pdev, ai->power, 0);
+        pci_enable_wake(pdev, pci_choose_state(pdev, ai->power), 0);
 
         if (ai->power > 1) {
                 reset_card(dev, 0);
@@ -5541,7 +5541,7 @@ static int airo_pci_resume(struct pci_dev *pdev)
         }
         writeConfigRid(ai, 0);
         enable_MAC(ai, &rsp, 0);
-        ai->power = 0;
+        ai->power = PMSG_ON;
         netif_device_attach(dev);
         netif_wake_queue(dev);
         enable_interrupts(ai);