diff options
| author | Michal Schmidt <xschmi00@stud.feec.vutbr.cz> | 2005-10-04 15:46:21 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 15:46:21 +0400 |
| commit | 53232803241ae0f26b39897a4d4b37775837de00 (patch) | |
| tree | b4ab0478eb6b32d7c799d6161502c3d6f761e3d9 /drivers/net | |
| parent | d5919586265d36c6694a5d10ba589c02806873b6 (diff) | |
| download | linux-53232803241ae0f26b39897a4d4b37775837de00.tar.xz | |
airo: fix resume
Cisco Aironet doesn't resume properly from swsusp, because the resume
method confuses a PM_EVENT_* for a PCI power state. It thinks that it is
resuming from PCI_D1 and doesn't do the necessary initialization of the
card.
Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/airo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 746456c34df8..cb429e783749 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -5504,12 +5504,13 @@ static int airo_pci_resume(struct pci_dev *pdev) struct net_device *dev = pci_get_drvdata(pdev); struct airo_info *ai = dev->priv; Resp rsp; + pci_power_t prev_state = pdev->current_state; - pci_set_power_state(pdev, 0); + pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - pci_enable_wake(pdev, pci_choose_state(pdev, ai->power), 0); + pci_enable_wake(pdev, PCI_D0, 0); - if (ai->power.event > 1) { + if (prev_state != PCI_D1) { reset_card(dev, 0); mpi_init_descriptors(ai); setup_card(ai, dev->dev_addr, 0); |