diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/net/tokenring/smctr.c | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
| -rw-r--r-- | drivers/net/tokenring/smctr.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index e9481039d..83024732a 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c @@ -3719,7 +3719,7 @@ static int __init smctr_probe1(struct net_device *dev, int ioaddr) err = smctr_chk_mca(dev); if(err < 0) { - kfree_s(tp, sizeof(struct net_local)); + kfree(tp); return (-ENODEV); } } @@ -5830,7 +5830,7 @@ int init_module(void) if(register_trdev(dev_smctr[i]) != 0) { - kfree_s(dev_smctr[i], sizeof(struct net_device)); + kfree(dev_smctr[i]); dev_smctr[i] = NULL; if(i == 0) { @@ -5866,9 +5866,8 @@ void cleanup_module(void) if(dev_smctr[i]->irq) free_irq(dev_smctr[i]->irq, dev_smctr[i]); if(dev_smctr[i]->priv) - kfree_s(dev_smctr[i]->priv, - sizeof(struct net_local)); - kfree_s(dev_smctr[i], sizeof(struct net_device)); + kfree(dev_smctr[i]->priv); + kfree(dev_smctr[i]); dev_smctr[i] = NULL; } } |