diff options
| author | Linus Torvalds | 2005-04-26 18:02:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-04-26 18:02:40 +0200 |
| commit | 97af11286d68e359f61579214ca7a7b4433fe458 (patch) | |
| tree | 3d89de007d362d688bf48528b906faa9f0f29814 /drivers/serial/amba-pl010.c | |
| parent | Automatic merge of kernel.org:/home/rmk/linux-2.6-rmk.git (diff) | |
| parent | [PATCH] Serial: Convert 8250_hp300 to use serial8250_{un,}register_port (diff) | |
| download | kernel-qcow2-linux-97af11286d68e359f61579214ca7a7b4433fe458.tar.gz kernel-qcow2-linux-97af11286d68e359f61579214ca7a7b4433fe458.tar.xz kernel-qcow2-linux-97af11286d68e359f61579214ca7a7b4433fe458.zip | |
Automatic merge of kernel.org:/home/rmk/linux-2.6-serial.git
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 484f6fb900b5..f2a5e2933c47 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -172,7 +172,7 @@ pl010_rx_chars(struct uart_port *port) * out of the main execution path */ rsr = UART_GET_RSR(port) | UART_DUMMY_RSR_RX; - if (rsr & UART01x_RSR_ANY) { + if (unlikely(rsr & UART01x_RSR_ANY)) { if (rsr & UART01x_RSR_BE) { rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE); port->icount.brk++; |