diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-03 17:24:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-03 17:24:08 -0700 |
| commit | 8800cea62025a5209d110c5fa5990429239d6eee (patch) | |
| tree | 2aa9e4732d7014dcda4c0e80d2e377f52e2262e9 /drivers/net/wan/sdla_chdlc.c | |
| parent | 84e48b6d64fdc29586bc7d9329f986cdae591a80 (diff) | |
| parent | 14d50e78f947d340066ee0465dd892ad1d9162c0 (diff) | |
| download | op-kernel-dev-8800cea62025a5209d110c5fa5990429239d6eee.zip op-kernel-dev-8800cea62025a5209d110c5fa5990429239d6eee.tar.gz | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'drivers/net/wan/sdla_chdlc.c')
| -rw-r--r-- | drivers/net/wan/sdla_chdlc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c index afbe002..496d292 100644 --- a/drivers/net/wan/sdla_chdlc.c +++ b/drivers/net/wan/sdla_chdlc.c @@ -3664,15 +3664,10 @@ static void wanpipe_tty_close(struct tty_struct *tty, struct file * filp) chdlc_disable_comm_shutdown(card); unlock_adapter_irq(&card->wandev.lock,&smp_flags); - if (card->tty_buf){ - kfree(card->tty_buf); - card->tty_buf=NULL; - } - - if (card->tty_rx){ - kfree(card->tty_rx); - card->tty_rx=NULL; - } + kfree(card->tty_buf); + card->tty_buf = NULL; + kfree(card->tty_rx); + card->tty_rx = NULL; } return; } |
