Skip to content

Commit

Permalink
at1700: fix double free_irq
Browse files Browse the repository at this point in the history
free_irq() is called both in net_close() and cleanup_card().  Since it
is requested in at1700_probe1(), leave free_irq() only in cleanup_card()
for balance.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Kulikov Vasiliy authored and David S. Miller committed Jul 12, 2010
1 parent 835bb60 commit 451d33d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/at1700.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 451d33d

Please sign in to comment.