]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
at1700: fix double free_irq
authorKulikov Vasiliy <segooon@gmail.com>
Fri, 9 Jul 2010 02:31:26 +0000 (02:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jul 2010 01:15:08 +0000 (18:15 -0700)
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>
drivers/net/at1700.c

index 93185f5f09accd10ec947b2b30179071703e4f8e..89876897a6fed5244358740795e98207507799a6 100644 (file)
@@ -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);