From: Uli Luckas <u.luckas@road-gmbh.de>
Date: Thu, 22 Jun 2006 15:49:54 +0000 (+0100)
Subject: [ARM] 3624/1: Report true modem control line states
X-Git-Tag: v2.6.18-rc1~1081^2~221^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0;p=linux-2.6

[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>
---

diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 77d4568ccc..ae36495685 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)
 	unsigned char status;
 	unsigned int ret;
 
-return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
 	status = serial_in(up, UART_MSR);
 
 	ret = 0;