[ARM] 3624/1: Report true modem control line states
authorUli Luckas <u.luckas@road-gmbh.de>
Thu, 22 Jun 2006 15:49:54 +0000 (16:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 22 Jun 2006 15:49:54 +0000 (16:49 +0100)
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>
drivers/serial/pxa.c

index 77d4568ccc3a7fdc0811783e7a1bbf52e7e1d5b9..ae3649568541d091a24e121f391d061f514285fd 100644 (file)
@@ -269,7 +269,6 @@ static unsigned int serial_pxa_get_mctrl(struct uart_port *port)
        unsigned char status;
        unsigned int ret;
 
-return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
        status = serial_in(up, UART_MSR);
 
        ret = 0;