---

yaml --- r: 325735 b: refs/heads/master c: 0324a82 h: refs/heads/master i: 325733: 76bd8ec 325731: a9c590a 325727: 4e0212d v: v3
git-mirror · Sep 6, 2012 · 6829f24 · 6829f24
1 parent 75c61d4
commit 6829f24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52c5513d5925554d1e22288525bcb7d25fa98b16
+refs/heads/master: 0324a821029e1f54e7a7f8fed48693cfce42dc0e
diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c
@@ -224,8 +224,11 @@ static void transmit_chars(struct uart_omap_port *up, unsigned int lsr)
 			break;
 	} while (--count > 0);
 
-	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {
+		spin_unlock(&up->port.lock);
 		uart_write_wakeup(&up->port);
+		spin_lock(&up->port.lock);
+	}
 
 	if (uart_circ_empty(xmit))
 		serial_omap_stop_tx(&up->port);