diff --git a/[refs] b/[refs] index 2a05027e151a..48f9a62fee23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 835bb606faffcd761e7abbc6b5de89ea5c409123 +refs/heads/master: 451d33dd223f15451c1b8fb388447d39e1cd955b diff --git a/trunk/drivers/net/at1700.c b/trunk/drivers/net/at1700.c index 93185f5f09ac..89876897a6fe 100644 --- a/trunk/drivers/net/at1700.c +++ b/trunk/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);