diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-06-21 00:33:04 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 00:37:26 +0200 |
| commit | 1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3 (patch) | |
| tree | 3b35b769ca28b28bb19bc020c17721a7dadcc446 /drivers/net/wireless/airo.c | |
| parent | [PATCH] defxx: Use irqreturn_t for the interrupt handler (diff) | |
| download | linux-1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3.tar.xz linux-1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3.zip | |
[PATCH] fix int vs. pm_message_t confusion in airo
Fix int vs. pm_message_t confusion in airo. Should change no code.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -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 { 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); |