summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdike <jdike>2003-02-02 18:09:30 +0000
committerjdike <jdike>2003-02-02 18:09:30 +0000
commit42dfa5da8dd89169ddd4a5a5cf9d642ee06561aa (patch)
tree157e024dbb4673df4f8fb50bdf2ae1debf99d979
parent12da90345f38701ea576f53eb285ed502d2b8ba9 (diff)
downloaduml-history-42dfa5da8dd89169ddd4a5a5cf9d642ee06561aa.tar.gz
A bit of code cleanup.
-rw-r--r--arch/um/drivers/line.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 88c6f3f..1cac81e 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -372,7 +372,7 @@ int line_get_config(char *name, struct line *lines, int num, char *str,
dev = simple_strtoul(name, &end, 0);
if((*end != '\0') || (end == name)){
- *error_out = "line_setup failed to parse device number";
+ *error_out = "line_get_config failed to parse device number";
return(0);
}
@@ -382,15 +382,15 @@ int line_get_config(char *name, struct line *lines, int num, char *str,
}
line = &lines[dev];
+
down(&line->sem);
-
if(!line->valid)
CONFIG_CHUNK(str, size, n, "none", 1);
else if(line->count == 0)
CONFIG_CHUNK(str, size, n, line->init_str, 1);
else n = chan_config_string(&line->chan_list, str, size, error_out);
-
up(&line->sem);
+
return(n);
}