From: Kulikov Vasiliy <segooon@gmail.com>
Date: Fri, 9 Jul 2010 02:31:26 +0000 (+0000)
Subject: at1700: fix double free_irq
X-Git-Tag: MMI-PSA29.97-13-9~23092^2~267
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=451d33dd223f15451c1b8fb388447d39e1cd955b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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);