diff --git a/[refs] b/[refs] index 0ba566b267c4..2452ac42e134 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b76a68c6caafef5a91cdc80958aecaca76a8896 +refs/heads/master: 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 diff --git a/trunk/drivers/serial/pxa.c b/trunk/drivers/serial/pxa.c index 77d4568ccc3a..ae3649568541 100644 --- a/trunk/drivers/serial/pxa.c +++ b/trunk/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;