diff -r 6ca369325cdd -r 78c838980258 devices/forcedeth-2.6.19-ethercat.c --- a/devices/forcedeth-2.6.19-ethercat.c Thu Feb 22 10:06:32 2007 +0000 +++ b/devices/forcedeth-2.6.19-ethercat.c Thu Feb 22 10:15:02 2007 +0000 @@ -4273,12 +4273,12 @@ 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);