diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/tty/serial/ip22zilog.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/tty/serial/ip22zilog.c')
| -rw-r--r-- | drivers/tty/serial/ip22zilog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c index ebff4a1d4bcc..7b1cda59ebb5 100644 --- a/drivers/tty/serial/ip22zilog.c +++ b/drivers/tty/serial/ip22zilog.c | |||
| @@ -375,7 +375,7 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up, | |||
| 375 | * be nice to transmit console writes just like we normally would for | 375 | * be nice to transmit console writes just like we normally would for |
| 376 | * a TTY line. (ie. buffered and TX interrupt driven). That is not | 376 | * a TTY line. (ie. buffered and TX interrupt driven). That is not |
| 377 | * easy because console writes cannot sleep. One solution might be | 377 | * easy because console writes cannot sleep. One solution might be |
| 378 | * to poll on enough port->xmit space becomming free. -DaveM | 378 | * to poll on enough port->xmit space becoming free. -DaveM |
| 379 | */ | 379 | */ |
| 380 | if (!(status & Tx_BUF_EMP)) | 380 | if (!(status & Tx_BUF_EMP)) |
| 381 | return; | 381 | return; |