From fb9d85429bfa5fa29f0fb8d65c8e366602d944a7 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 9 Sep 2011 20:08:48 -0400
Subject: [PATCH] --- yaml --- r: 296419 b: refs/heads/master c:
 c8e2876fc8adaf9539f051fcda5d551308e8a0f8 h: refs/heads/master i:   296417:
 21457dc4e6628a55bb77a41cc4ae2cb36a14f9ea   296415:
 0b136a1df67e1547f54462480a6fdd2bb495af45 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/um/drivers/line.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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);