From bddb8bd5e991140a1950e3f2918c3badace6d4bb Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Thu, 22 Feb 2007 10:15:02 +0000
Subject: [PATCH] Minor fix in 2.6.19 forcedeth driver.
---
devices/forcedeth-2.6.19-ethercat.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/devices/forcedeth-2.6.19-ethercat.c b/devices/forcedeth-2.6.19-ethercat.c
index 55ae4aa1..b24a6207 100644
--- a/devices/forcedeth-2.6.19-ethercat.c
+++ b/devices/forcedeth-2.6.19-ethercat.c
@@ -4273,12 +4273,12 @@ static int nv_close(struct net_device *dev)
nv_txrx_reset(dev);
/* disable interrupts on the nic or we will lock up */
- base = get_hwbase(dev);
- if (!np->ecdev) nv_disable_hw_interrupts(dev, np->irqmask);
- pci_push(base);
- dprintk(KERN_INFO "%s: Irqmask is zero again\n", dev->name);
-
if (!np->ecdev) {
+ base = get_hwbase(dev);
+ nv_disable_hw_interrupts(dev, np->irqmask);
+ pci_push(base);
+ dprintk(KERN_INFO "%s: Irqmask is zero again\n", dev->name);
+
spin_unlock_irq(&np->lock);
nv_free_irq(dev);
--
GitLab