Re: Diff between Linus' and linux-mips git: declance
From: Martin Michlmayr <hidden>
Date: 2006-02-20 14:22:33
Also in:
linux-mips
Updated patch, please apply. [PATCH] Remove delta between Linus' and linux-mips git trees in declance There are three 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. And the third is cosmetic. Signed-off-by: Martin Michlmayr <redacted> ---
--- a/drivers/net/declance.c 2006-02-03 03:07:02.000000000 +0000
+++ b/drivers/net/declance.c 2006-02-19 23:50:11.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;
@@ -1301,6 +1301,7 @@ 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)
--
Martin Michlmayr
http://www.cyrius.com/