From 80b73e1cb193f7cdaa846ab3dfea1e5a1d285638 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sat, 10 Feb 2007 01:45:23 -0800
Subject: [PATCH] --- yaml --- r: 47543 b: refs/heads/master c:
 5ff7205dd9084c96cf2bedc4d0481790c5a7a635 h: refs/heads/master i:   47541:
 186a983065a5b853de4667402828d69711dd0879   47539:
 e05c27b9e4535e0d4497a2a0921fdbadeade1a9d   47535:
 c5b8431703c6bd0a536b6fd832e94768871694b9 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/mxser_new.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d781d5de085b..b0ca7479e04a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722d5e4ae89f061582cc46ccbbd3b5ae87a6e165
+refs/heads/master: 5ff7205dd9084c96cf2bedc4d0481790c5a7a635
diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c
index 1c8e00c4caad..d52ecff7320a 100644
--- a/trunk/drivers/char/mxser_new.c
+++ b/trunk/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;