diff options
| author |   Kulikov Vasiliy <segooon@gmail.com> | 2010-07-09 02:31:26 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-07-11 18:15:08 -0700 |
| commit | 451d33dd223f15451c1b8fb388447d39e1cd955b (patch) | |
| tree | a7507b0a9f00d998af090973e6c11cc8da3c9be4 /drivers | |
| parent | cxgb4: exclude registers with read side effects from register dumps (diff) | |
| download | linux-dev-451d33dd223f15451c1b8fb388447d39e1cd955b.tar.xz linux-dev-451d33dd223f15451c1b8fb388447d39e1cd955b.zip | |
at1700: fix double free_irq
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/at1700.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 93185f5f09ac..89876897a6fe 100644 --- 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); |