diff --git a/[refs] b/[refs]
index 06c730d6fc33..cfa32d88b8f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fdc28931176a17ef0bdc5d35742925a155533c4
+refs/heads/master: 0ad7c9af3e1cbb97082062266705d6cb5fb207ee
diff --git a/trunk/drivers/tty/moxa.c b/trunk/drivers/tty/moxa.c
index a290e9ebafe0..6255561dd2a3 100644
--- a/trunk/drivers/tty/moxa.c
+++ b/trunk/drivers/tty/moxa.c
@@ -1202,14 +1202,15 @@ static int moxa_write(struct tty_struct *tty,
 		      const unsigned char *buf, int count)
 {
 	struct moxa_port *ch = tty->driver_data;
+	unsigned long flags;
 	int len;
 
 	if (ch == NULL)
 		return 0;
 
-	spin_lock_bh(&moxa_lock);
+	spin_lock_irqsave(&moxa_lock, flags);
 	len = MoxaPortWriteData(tty, buf, count);
-	spin_unlock_bh(&moxa_lock);
+	spin_unlock_irqrestore(&moxa_lock, flags);
 
 	set_bit(LOWWAIT, &ch->statusflags);
 	return len;