summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <Vineet.Gupta1@synopsys.com>2013-08-01 21:49:20 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-02 11:54:12 +0800
commit00a135b3952f6ccedfb688919c59bb3fa199a11f (patch)
tree60e78c8a62549c4b4596c4a04f7bfcfdf0135ea7
parent5284eba7b37dfeffe75bfdf81a13e9efebe0480a (diff)
downloadtalos-obmc-linux-00a135b3952f6ccedfb688919c59bb3fa199a11f.tar.gz
talos-obmc-linux-00a135b3952f6ccedfb688919c59bb3fa199a11f.zip
serial/arc-uart: Remove the goto/label
Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Cc: Mischa Jonker <mjonker@synopsys.com> Cc: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/arc_uart.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index e296c892df61..6ac5270c74dd 100644
--- a/drivers/tty/serial/arc_uart.c
+++ b/drivers/tty/serial/arc_uart.c
@@ -248,12 +248,9 @@ static void arc_serial_rx_chars(struct arc_uart_port *uart, unsigned int status)
ch = UART_GET_DATA(uart);
uart->port.icount.rx++;
- if (unlikely(uart_handle_sysrq_char(&uart->port, ch)))
- goto done;
+ if (!(uart_handle_sysrq_char(&uart->port, ch)))
+ uart_insert_char(&uart->port, status, RXOERR, ch, flg);
- uart_insert_char(&uart->port, status, RXOERR, ch, flg);
-
-done:
tty_flip_buffer_push(&uart->port.state->port);
} while (!((status = UART_GET_STATUS(uart)) & RXEMPTY));
}
OpenPOWER on IntegriCloud