From 6e87b5087f4ba5bb22bb532b196426aeefc92b39 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Sat, 12 Nov 2005 22:09:22 +0000 Subject: [PATCH] --- yaml --- r: 14130 b: refs/heads/master c: 270c7a721548d116d9e054f48469e75cb0f35288 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/sa1100.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 797ae061ea7c..7e705cb34b26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa609435a6edaaca14a646d470d7e10abebc8604 +refs/heads/master: 270c7a721548d116d9e054f48469e75cb0f35288 diff --git a/trunk/drivers/serial/sa1100.c b/trunk/drivers/serial/sa1100.c index fd9deee20e05..0e3daf6d7b50 100644 --- a/trunk/drivers/serial/sa1100.c +++ b/trunk/drivers/serial/sa1100.c @@ -156,7 +156,7 @@ static void sa1100_stop_tx(struct uart_port *port) } /* - * interrupts may not be disabled on entry + * port locked and interrupts disabled */ static void sa1100_start_tx(struct uart_port *port) { @@ -164,11 +164,9 @@ static void sa1100_start_tx(struct uart_port *port) unsigned long flags; u32 utcr3; - spin_lock_irqsave(&sport->port.lock, flags); utcr3 = UART_GET_UTCR3(sport); sport->port.read_status_mask |= UTSR0_TO_SM(UTSR0_TFS); UART_PUT_UTCR3(sport, utcr3 | UTCR3_TIE); - spin_unlock_irqrestore(&sport->port.lock, flags); } /*