diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/char/tty_io.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
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: |