diff options
Diffstat (limited to 'drivers/net/wireless/ath5k/base.c')
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 2028866f5995..b20a45aa8680 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -40,7 +40,6 @@ | |||
40 | * | 40 | * |
41 | */ | 41 | */ |
42 | 42 | ||
43 | #include <linux/version.h> | ||
44 | #include <linux/module.h> | 43 | #include <linux/module.h> |
45 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
46 | #include <linux/hardirq.h> | 45 | #include <linux/hardirq.h> |
@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
587 | ath5k_stop_hw(sc); | 586 | ath5k_stop_hw(sc); |
588 | 587 | ||
589 | free_irq(pdev->irq, sc); | 588 | free_irq(pdev->irq, sc); |
590 | pci_disable_msi(pdev); | ||
591 | pci_save_state(pdev); | 589 | pci_save_state(pdev); |
592 | pci_disable_device(pdev); | 590 | pci_disable_device(pdev); |
593 | pci_set_power_state(pdev, PCI_D3hot); | 591 | pci_set_power_state(pdev, PCI_D3hot); |
@@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev) | |||
616 | */ | 614 | */ |
617 | pci_write_config_byte(pdev, 0x41, 0); | 615 | pci_write_config_byte(pdev, 0x41, 0); |
618 | 616 | ||
619 | pci_enable_msi(pdev); | ||
620 | |||
621 | err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); | 617 | err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); |
622 | if (err) { | 618 | if (err) { |
623 | ATH5K_ERR(sc, "request_irq failed\n"); | 619 | ATH5K_ERR(sc, "request_irq failed\n"); |
624 | goto err_msi; | 620 | goto err_no_irq; |
625 | } | 621 | } |
626 | 622 | ||
627 | err = ath5k_init(sc); | 623 | err = ath5k_init(sc); |
@@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev) | |||
642 | return 0; | 638 | return 0; |
643 | err_irq: | 639 | err_irq: |
644 | free_irq(pdev->irq, sc); | 640 | free_irq(pdev->irq, sc); |
645 | err_msi: | 641 | err_no_irq: |
646 | pci_disable_msi(pdev); | ||
647 | pci_disable_device(pdev); | 642 | pci_disable_device(pdev); |
648 | return err; | 643 | return err; |
649 | } | 644 | } |