From e30359748e0c93a2f8c0c07d37bdb7eef951bad2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 30 Jun 2006 13:56:13 +0100
Subject: [PATCH] --- yaml --- r: 32105 b: refs/heads/master c:
 b07db75a9f542c1a1745fcb047fd743843db8daa h: refs/heads/master i:   32103:
 66b1d6cc7c61db100d0461722b85d33d8dff014e v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/declance.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b96b77cc4aaa..1267d76fb11e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22db99bd32646aa33051e23420ff3517cc70cad5
+refs/heads/master: b07db75a9f542c1a1745fcb047fd743843db8daa
diff --git a/trunk/drivers/net/declance.c b/trunk/drivers/net/declance.c
index 2038ca7e49ce..6ad5796121c8 100644
--- a/trunk/drivers/net/declance.c
+++ b/trunk/drivers/net/declance.c
@@ -703,8 +703,8 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id,
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t
-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
+				   struct pt_regs *regs)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct lance_private *lp = netdev_priv(dev);
@@ -1253,7 +1253,7 @@ static int __init dec_lance_init(const int type, const int slot)
 	return 0;
 
 err_out_free_dev:
-	kfree(dev);
+	free_netdev(dev);
 
 err_out:
 	return ret;
@@ -1299,6 +1299,7 @@ static void __exit dec_lance_cleanup(void)
 	while (root_lance_dev) {
 		struct net_device *dev = root_lance_dev;
 		struct lance_private *lp = netdev_priv(dev);
+
 		unregister_netdev(dev);
 #ifdef CONFIG_TC
 		if (lp->slot >= 0)