mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

TTY: um/line, add tty_port

Browse source 
And use count from there.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: user-mode-linux-devel@lists.sourceforge.net
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Jiri Slaby 2012-06-04 13:35:26 +02:00 committed by Richard Weinberger
parent 28a33cbc24
commit 060ed31dd9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/um/drivers/line.c
View file

@ -404,7 +404,7 @@ int line_open(struct line *lines, struct tty_struct *tty)
goto out_unlock;
err = 0;
if (line->count++)
if (line->port.count++)
goto out_unlock;
BUG_ON(tty->driver_data);
@ -446,7 +446,7 @@ void line_close(struct tty_struct *tty, struct file * filp)
mutex_lock(&line->count_lock);
BUG_ON(!line->valid);
if (--line->count)
if (--line->port.count)
goto out_unlock;
line->tty = NULL;
@ -478,7 +478,7 @@ int setup_one_line(struct line *lines, int n, char *init,
mutex_lock(&line->count_lock);
if (line->count) {
if (line->port.count) {
*error_out = "Device is already open";
goto out;
}
@ -663,6 +663,7 @@ int register_lines(struct line_driver *line_driver,
driver->init_termios = tty_std_termios;
for (i = 0; i < nlines; i++) {
tty_port_init(&lines[i].port);
spin_lock_init(&lines[i].lock);
mutex_init(&lines[i].count_lock);
lines[i].driver = line_driver;

2
arch/um/drivers/line.h
View file

@ -32,9 +32,9 @@ struct line_driver {
};
struct line {
struct tty_port port;
struct tty_struct *tty;
struct mutex count_lock;
unsigned long count;
int valid;
char *init_str;