summaryrefslogtreecommitdiffstats
path: root/drivers/serial/21285.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:29:44 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-04-26 15:29:44 +0100
commit45849282bfd7543253761cbf7db96151b05e5ed1 (patch)
tree1e02a8874f487041795f27427d2ee22e8c236c8c /drivers/serial/21285.c
parentb453257f057b834fdf9f4a6ad6133598b79bd982 (diff)
downloadkernel-crypto-45849282bfd7543253761cbf7db96151b05e5ed1.tar.gz
kernel-crypto-45849282bfd7543253761cbf7db96151b05e5ed1.tar.xz
kernel-crypto-45849282bfd7543253761cbf7db96151b05e5ed1.zip
[PATCH] Serial: Ensure error paths are marked with unlikely()
Ensure ARM serial driver error paths are marked with the unlikely() compiler hint. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/21285.c')
-rw-r--r--drivers/serial/21285.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index f8504b0adeb..33fbda79f35 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -110,7 +110,7 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id, struct pt_regs *r
port->icount.rx++;
rxs = *CSR_RXSTAT | RXSTAT_DUMMY_READ;
- if (rxs & RXSTAT_ANYERR) {
+ if (unlikely(rxs & RXSTAT_ANYERR)) {
if (rxs & RXSTAT_PARITY)
port->icount.parity++;
else if (rxs & RXSTAT_FRAME)