Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14130
b: refs/heads/master
c: 270c7a7
h: refs/heads/master
v: v3
  • Loading branch information
Florin Malita authored and Russell King committed Nov 12, 2005
1 parent 6d00aaf commit 6e87b50
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fa609435a6edaaca14a646d470d7e10abebc8604
refs/heads/master: 270c7a721548d116d9e054f48469e75cb0f35288
4 changes: 1 addition & 3 deletions trunk/drivers/serial/sa1100.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,17 @@ 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)
{
struct sa1100_port *sport = (struct sa1100_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);
}

/*
Expand Down

0 comments on commit 6e87b50

Please sign in to comment.