Remove delta between Linus' and linux-mips git trees in declance
There are two changes between the Linus' and linux-mips git trees
regarding the declaner driver. The first change is certainly correct
(as it is consistent with the rest of the file) and should be applied
to mainline; the other change seems correct too.
Signed-off-by: Martin Michlmayr <tbm@xxxxxxxxxx>
--- linux-2.6.16-rc4/drivers/net/declance.c 2006-02-19 20:09:07.000000000 +0000
+++ mips-2.6.16-rc4/drivers/net/declance.c 2006-02-19 20:15:22.000000000 +0000
@@ -704,8 +704,8 @@
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);
@@ -1255,7 +1255,7 @@
return 0;
err_out_free_dev:
- kfree(dev);
+ free_netdev(dev);
err_out:
return ret;
--
Martin Michlmayr
http://www.cyrius.com/
