netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -FIX] e100: fix irq leak on suspend/resume
@ 2007-01-29 22:31 Auke Kok
  2007-01-30 14:37 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Auke Kok @ 2007-01-29 22:31 UTC (permalink / raw)
  To: jgarzik; +Cc: Frederik Deweerdt, netdev

e100: fix irq leak on suspend/resume

From: Frederik Deweerdt <frederik.deweerdt@gmail.com>

The e100_resume() function should be calling netif_device_detach and
free_irq. This fixes multiple irq's being allocated after resume.

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 drivers/net/e100.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index c2ae2a2..3208dac 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2725,6 +2725,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 	del_timer_sync(&nic->watchdog);
 	netif_carrier_off(nic->netdev);
 
+	netif_device_detach(netdev);
 	pci_save_state(pdev);
 
 	if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2736,6 +2737,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 	}
 
 	pci_disable_device(pdev);
+	free_irq(pdev->irq, netdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 
 	return 0;

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -FIX] e100: fix irq leak on suspend/resume
  2007-01-29 22:31 [PATCH -FIX] e100: fix irq leak on suspend/resume Auke Kok
@ 2007-01-30 14:37 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-01-30 14:37 UTC (permalink / raw)
  To: Auke Kok; +Cc: Frederik Deweerdt, netdev

Auke Kok wrote:
> e100: fix irq leak on suspend/resume
> 
> From: Frederik Deweerdt <frederik.deweerdt@gmail.com>
> 
> The e100_resume() function should be calling netif_device_detach and
> free_irq. This fixes multiple irq's being allocated after resume.
> 
> Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>

applied



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-01-30 14:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-29 22:31 [PATCH -FIX] e100: fix irq leak on suspend/resume Auke Kok
2007-01-30 14:37 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).