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/char/istallion.c | |
parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/char/istallion.c')
-rw-r--r-- | drivers/char/istallion.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index bee522007..71dd53691 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c @@ -868,9 +868,9 @@ void cleanup_module() printk("STALLION: failed to un-register serial memory device, " "errno=%d\n", -i); if (stli_tmpwritebuf != (char *) NULL) - kfree_s(stli_tmpwritebuf, STLI_TXBUFSIZE); + kfree(stli_tmpwritebuf); if (stli_txcookbuf != (char *) NULL) - kfree_s(stli_txcookbuf, STLI_TXBUFSIZE); + kfree(stli_txcookbuf); for (i = 0; (i < stli_nrbrds); i++) { if ((brdp = stli_brds[i]) == (stlibrd_t *) NULL) @@ -880,14 +880,14 @@ void cleanup_module() if (portp != (stliport_t *) NULL) { if (portp->tty != (struct tty_struct *) NULL) tty_hangup(portp->tty); - kfree_s(portp, sizeof(stliport_t)); + kfree(portp); } } iounmap(brdp->membase); if (brdp->iosize > 0) release_region(brdp->iobase, brdp->iosize); - kfree_s(brdp, sizeof(stlibrd_t)); + kfree(brdp); stli_brds[i] = (stlibrd_t *) NULL; } |