diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2007-12-12 19:30:42 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-12-14 15:26:07 -0500 |
commit | 8543da6672b0994921f014f2250e27ae81645580 (patch) | |
tree | 0631d447365cfab3c128c6017017af1248c646f1 /drivers | |
parent | 813820b9b9adb98d4ad3cd7434eb662b0fc15684 (diff) |
e100: free IRQ to remove warningwhenrebooting
Adapted from Ian Wienand <ianw@gelato.unsw.edu.au>
Explicitly free the IRQ before removing the device to remove a
warning "Destroying IRQ without calling free_irq"
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Ian Wienand <ianw@gelato.unsw.edu.au>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/e100.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index e1c8a0d023ea..2b06e4b4dabc 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2737,8 +2737,9 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2737 | pci_enable_wake(pdev, PCI_D3cold, 0); | 2737 | pci_enable_wake(pdev, PCI_D3cold, 0); |
2738 | } | 2738 | } |
2739 | 2739 | ||
2740 | pci_disable_device(pdev); | ||
2741 | free_irq(pdev->irq, netdev); | 2740 | free_irq(pdev->irq, netdev); |
2741 | |||
2742 | pci_disable_device(pdev); | ||
2742 | pci_set_power_state(pdev, PCI_D3hot); | 2743 | pci_set_power_state(pdev, PCI_D3hot); |
2743 | 2744 | ||
2744 | return 0; | 2745 | return 0; |
@@ -2780,6 +2781,8 @@ static void e100_shutdown(struct pci_dev *pdev) | |||
2780 | pci_enable_wake(pdev, PCI_D3cold, 0); | 2781 | pci_enable_wake(pdev, PCI_D3cold, 0); |
2781 | } | 2782 | } |
2782 | 2783 | ||
2784 | free_irq(pdev->irq, netdev); | ||
2785 | |||
2783 | pci_disable_device(pdev); | 2786 | pci_disable_device(pdev); |
2784 | pci_set_power_state(pdev, PCI_D3hot); | 2787 | pci_set_power_state(pdev, PCI_D3hot); |
2785 | } | 2788 | } |