From: Jeff Garzik <jgarzik@mandrakesoft.com>
Date: Sun, 4 Aug 2002 07:50:09 +0000 (-0400)
Subject: synchronize_irq updates for dl2k and ns83820 gige net drivers
X-Git-Tag: v2.5.31~12^2~12
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=daf69e7a34e13c609e4a0d8167f07541b3b4e499;p=history.git

synchronize_irq updates for dl2k and ns83820 gige net drivers
---

diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 67c6ffdf7c0f..9bab64cd6024 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1635,7 +1635,7 @@ rio_close (struct net_device *dev)
 
 	/* Stop Tx and Rx logics */
 	writel (TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl);
-	synchronize_irq ();
+	synchronize_irq (dev->irq);
 	free_irq (dev->irq, dev);
 	del_timer_sync (&np->timer);
 	
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 2675caf0fc94..1da23f1378e8 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -755,7 +755,7 @@ static void ns83820_cleanup_rx(struct ns83820 *dev)
 
 	/* synchronize with the interrupt handler and kill it */
 	dev->rx_info.up = 0;
-	synchronize_irq();
+	synchronize_irq(dev->pci_dev->irq);
 
 	/* touch the pci bus... */
 	readl(dev->base + IMR);
@@ -1296,11 +1296,11 @@ static int ns83820_stop(struct net_device *_dev)
 	readl(dev->base + IER);
 
 	dev->rx_info.up = 0;
-	synchronize_irq();
+	synchronize_irq(dev->pci_dev->irq);
 
 	ns83820_do_reset(dev, CR_RST);
 
-	synchronize_irq();
+	synchronize_irq(dev->pci_dev->irq);
 
 	dev->IMR_cache &= ~(ISR_TXURN | ISR_TXIDLE | ISR_TXERR | ISR_TXDESC | ISR_TXOK);
 	ns83820_cleanup_rx(dev);