Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7135
b: refs/heads/master
c: 3d9c994
h: refs/heads/master
i:
  7133: 2bf98c3
  7131: a65e1a8
  7127: 4893215
  7119: 6d56ee1
  7103: b31ab85
v: v3
  • Loading branch information
Al Viro authored and David S. Miller committed Sep 6, 2005
1 parent 5154460 commit 72ebd88
Show file tree
Hide file tree
Showing 2 changed files with 8 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: e5e259466f2fe68251b1e1092949ef3d4dabb254
refs/heads/master: 3d9c994840f0e217c391871ddbb84a506d275658
10 changes: 7 additions & 3 deletions trunk/drivers/serial/sunsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,10 @@ static void sunsu_stop_tx(struct uart_port *port)

__stop_tx(up);

if (up->port.type == PORT_16C950 && tty_stop /*FIXME*/) {
/*
* We really want to stop the transmitter from sending.
*/
if (up->port.type == PORT_16C950) {
up->acr |= UART_ACR_TXDIS;
serial_icr_write(up, UART_ACR, up->acr);
}
Expand All @@ -283,10 +286,11 @@ static void sunsu_start_tx(struct uart_port *port)
up->ier |= UART_IER_THRI;
serial_out(up, UART_IER, up->ier);
}

/*
* We only do this from uart_start
* Re-enable the transmitter if we disabled it.
*/
if (tty_start && up->port.type == PORT_16C950 /*FIXME*/) {
if (up->port.type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
up->acr &= ~UART_ACR_TXDIS;
serial_icr_write(up, UART_ACR, up->acr);
}
Expand Down

0 comments on commit 72ebd88

Please sign in to comment.