diff options
author | Uli Luckas <u.luckas@road-gmbh.de> | 2006-06-22 11:49:54 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-22 11:49:54 -0400 |
commit | 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 (patch) | |
tree | cb2efd2684f74cfaa5f354f34acb77a13ee01811 | |
parent | 8b76a68c6caafef5a91cdc80958aecaca76a8896 (diff) |
[ARM] 3624/1: Report true modem control line states
Patch from Uli Luckas
This patch removes the fake return from serial_pxa_get_mctrl.
Signed-off-by: Uli Luckas <u.luckas@road-gmbh.de>
I just can't remember why this return was there.
Being in the first column clearly indicates it was meant to be removed.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/serial/pxa.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 77d4568ccc3a..ae3649568541 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -269,7 +269,6 @@ static unsigned int serial_pxa_get_mctrl(struct uart_port *port) | |||
269 | unsigned char status; | 269 | unsigned char status; |
270 | unsigned int ret; | 270 | unsigned int ret; |
271 | 271 | ||
272 | return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR; | ||
273 | status = serial_in(up, UART_MSR); | 272 | status = serial_in(up, UART_MSR); |
274 | 273 | ||
275 | ret = 0; | 274 | ret = 0; |