From: Pavel Machek <[email-masked]>

Fix int vs. pm_message_t confusion in airo. Should change no code.

Signed-off-by: Pavel Machek <[email-masked]>
Cc: Jeff Garzik <[email-masked]>
Signed-off-by: Andrew Morton <[email-masked]>
---

 drivers/net/wireless/airo.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff -puN drivers/net/wireless/airo.c~fix-int-vs-pm_message_t-confusion-in-airo drivers/net/wireless/airo.c
--- 25/drivers/net/wireless/airo.c~fix-int-vs-pm_message_t-confusion-in-airo	2005-06-15 17:42:50.000000000 -0700
+++ 25-akpm/drivers/net/wireless/airo.c	2005-06-15 17:42:50.000000000 -0700
@@ -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
@@ -5506,9 +5506,9 @@ static int airo_pci_suspend(struct pci_d
 	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)
@@ -5519,7 +5519,7 @@ static int airo_pci_resume(struct pci_de
 
 	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);
@@ -5548,7 +5548,7 @@ static int airo_pci_resume(struct pci_de
 	}
 	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);
_