---

yaml --- r: 296419 b: refs/heads/master c: c8e2876 h: refs/heads/master i: 296417: 21457dc 296415: 0b136a1 v: v3
git-mirror · Mar 24, 2012 · fb9d854 · fb9d854
1 parent d6694b9
commit fb9d854
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);