diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:02 -0500 |
commit | 735d5661d5c5f023a78fbe68e771e261040ff1b7 (patch) | |
tree | b9865f0322d8e74661639f5f33b1897b23004659 /drivers/char/tty_io.c | |
parent | fa671646f61182cd18234461a6e65f50c6558695 (diff) |
[PATCH] kfree cleanup: drivers/char
This is the drivers/char/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in drivers/char/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/tty_io.c')
-rw-r--r-- | drivers/char/tty_io.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index c586bfa852ee..4b1eef51ec59 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -1416,14 +1416,11 @@ end_init: | |||
1416 | 1416 | ||
1417 | /* Release locally allocated memory ... nothing placed in slots */ | 1417 | /* Release locally allocated memory ... nothing placed in slots */ |
1418 | free_mem_out: | 1418 | free_mem_out: |
1419 | if (o_tp) | 1419 | kfree(o_tp); |
1420 | kfree(o_tp); | ||
1421 | if (o_tty) | 1420 | if (o_tty) |
1422 | free_tty_struct(o_tty); | 1421 | free_tty_struct(o_tty); |
1423 | if (ltp) | 1422 | kfree(ltp); |
1424 | kfree(ltp); | 1423 | kfree(tp); |
1425 | if (tp) | ||
1426 | kfree(tp); | ||
1427 | free_tty_struct(tty); | 1424 | free_tty_struct(tty); |
1428 | 1425 | ||
1429 | fail_no_mem: | 1426 | fail_no_mem: |