Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 32105
b: refs/heads/master
c: b07db75
h: refs/heads/master
i:
  32103: 66b1d6c
v: v3
  • Loading branch information
Ralf Baechle authored and Jeff Garzik committed Jul 5, 2006
1 parent f3dea92 commit e303597
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22db99bd32646aa33051e23420ff3517cc70cad5
refs/heads/master: b07db75a9f542c1a1745fcb047fd743843db8daa
7 changes: 4 additions & 3 deletions trunk/drivers/net/declance.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit e303597

Please sign in to comment.