From da645f3be912a377ada97268e36360b0a4389ab0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 8 Sep 2011 20:34:52 -0400 Subject: [PATCH] um: switch line_remove() to setup_one_line() Signed-off-by: Al Viro Signed-off-by: Richard Weinberger --- arch/um/drivers/line.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index ac9bcfbbeee1..08c5fba6db84 100644 --- a/arch/um/drivers/line.c +++ b/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, -- 2.20.1