Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / drivers / net / at1700.c

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 93185f5f09accd10ec947b2b30179071703e4f8e..89876897a6fed5244358740795e98207507799a6 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -811,10 +811,8 @@ static int net_close(struct net_device *dev)
        /* No statistic counters on the chip to update. */
 
        /* Disable the IRQ on boards of fmv18x where it is feasible. */
-       if (lp->jumpered) {
+       if (lp->jumpered)
                outb(0x00, ioaddr + IOCONFIG1);
-               free_irq(dev->irq, dev);
-       }
 
        /* Power-down the chip.  Green, green, green! */
        outb(0x00, ioaddr + CONFIG_1);