dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

serial: clps711x: Return valid modem controls for port that not support it 

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Shiyan 2012-10-14 11:05:28 +04:00 committed by Greg Kroah-Hartman
parent cf03a884b9
commit 1593daf9a8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/serial/clps711x.c
View File

@ -191,12 +191,9 @@ static unsigned int clps711xuart_tx_empty(struct uart_port *port)
static unsigned int clps711xuart_get_mctrl(struct uart_port *port)
{
unsigned int port_addr;
unsigned int result = 0;
unsigned int status;
unsigned int status, result = 0;
port_addr = SYSFLG(port);
if (port_addr == SYSFLG1) {
if (port->line == 0) {
status = clps_readl(SYSFLG1);
if (status & SYSFLG1_DCD)
result |= TIOCM_CAR;
@ -204,7 +201,8 @@ static unsigned int clps711xuart_get_mctrl(struct uart_port *port)
result |= TIOCM_DSR;
if (status & SYSFLG1_CTS)
result |= TIOCM_CTS;
}
} else
result = TIOCM_DSR | TIOCM_CTS | TIOCM_CAR;
return result;
}