Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0

Authored by Uli Luckas
Committed by Russell King
1 parent 8b76a68c6c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 1 changed file with 0 additions and 1 deletions Side-by-side Diff

drivers/serial/pxa.c
Diff comments   View file @ 005b5e4
... ... @@ -269,7 +269,6 @@
269 269 unsigned char status;
270 270 unsigned int ret;
271 271  
272   -return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
273 272 status = serial_in(up, UART_MSR);
274 273  
275 274 ret = 0;