diff --git a/[refs] b/[refs] index 9d648313fb9a..dc063ee445ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04292b2cf8f02a33cfc1054c0c51aa8c77731813 +refs/heads/master: c8e2876fc8adaf9539f051fcda5d551308e8a0f8 diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c index 002d4a968ae6..9ffade87a8cf 100644 --- a/trunk/arch/um/drivers/line.c +++ b/trunk/arch/um/drivers/line.c @@ -509,8 +509,10 @@ int setup_one_line(struct line *lines, int n, char *init, *error_out = "Failed to allocate memory"; return -ENOMEM; } - if (line->valid) + if (line->valid) { tty_unregister_device(driver, n); + kfree(line->init_str); + } line->init_str = new; line->valid = 1; err = parse_chan_pair(new, line, n, opts, error_out);