From 5ff7205dd9084c96cf2bedc4d0481790c5a7a635 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Sat, 10 Feb 2007 01:45:23 -0800 Subject: [PATCH] [PATCH] Char: mxser_new, lock count and flags Both open count and INITIALIZED flag should be changed under lock. Signed-off-by: Jiri Slaby Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/mxser_new.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 1c8e00c4caa..d52ecff7320 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c @@ -853,9 +853,9 @@ static int mxser_startup(struct mxser_port *info) * and set the speed of the serial port */ mxser_change_speed(info, NULL); + info->flags |= ASYNC_INITIALIZED; spin_unlock_irqrestore(&info->slock, flags); - info->flags |= ASYNC_INITIALIZED; return 0; } @@ -925,6 +925,7 @@ static void mxser_shutdown(struct mxser_port *info) static int mxser_open(struct tty_struct *tty, struct file *filp) { struct mxser_port *info; + unsigned long flags; int retval, line; line = tty->index; @@ -941,7 +942,9 @@ static int mxser_open(struct tty_struct *tty, struct file *filp) /* * Start up serial port */ + spin_lock_irqsave(&info->slock, flags); info->count++; + spin_unlock_irqrestore(&info->slock, flags); retval = mxser_startup(info); if (retval) return retval;