From 7afafe606e2e830ea9a910d1901ac0e5cad21acf Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 8 Sep 2011 20:34:52 -0400 Subject: [PATCH] --- yaml --- r: 296412 b: refs/heads/master c: da645f3be912a377ada97268e36360b0a4389ab0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/line.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a8ff4455f1df..de4d6abce3d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8998af2b4f7a4dd500198f9a7bd4dc8411568b7d +refs/heads/master: da645f3be912a377ada97268e36360b0a4389ab0 diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c index ac9bcfbbeee1..08c5fba6db84 100644 --- a/trunk/arch/um/drivers/line.c +++ b/trunk/arch/um/drivers/line.c @@ -640,14 +640,11 @@ int line_id(char **str, int *start_out, int *end_out) int line_remove(struct line *lines, unsigned int num, int n, char **error_out) { - int err; - char config[sizeof("conxxxx=none\0")]; - - sprintf(config, "%d=none", n); - err = line_setup(lines, num, config, error_out); - if (err >= 0) - err = 0; - return err; + if (n >= num) { + *error_out = "Device number out of range"; + return -EINVAL; + } + return setup_one_line(lines, n, "none", INIT_ONE, error_out); } struct tty_driver *register_lines(struct line_driver *line_driver,