p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "sc16is7xx: implemented get_mctrl" 

This reverts commit a3f0b77f36.

Maarten writes:
	It appears to be wrong and I don't have a good idea how to fix
	it yet.

Cc: Maarten Brock <m.brock@vanmierlo.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
This commit is contained in:
Greg Kroah-Hartman 2016-03-07 16:10:08 -08:00
parent a3f0b77f36
commit 5f5357335e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/tty/serial/sc16is7xx.c
View File

@ -822,16 +822,10 @@ static unsigned int sc16is7xx_tx_empty(struct uart_port *port)
static unsigned int sc16is7xx_get_mctrl(struct uart_port *port)
{
unsigned int msr;
unsigned int ret = 0;
msr = sc16is7xx_port_read(port, SC16IS7XX_MSR_REG);
ret |= (msr & SC16IS7XX_MSR_CTS_BIT) ? TIOCM_CTS : 0;
ret |= (msr & SC16IS7XX_MSR_DSR_BIT) ? TIOCM_DSR : 0;
ret |= (msr & SC16IS7XX_MSR_RI_BIT) ? TIOCM_RNG : 0;
ret |= (msr & SC16IS7XX_MSR_CD_BIT) ? TIOCM_CAR : 0;
return ret;
/* DCD and DSR are not wired and CTS/RTS is handled automatically
* so just indicate DSR and CAR asserted
*/
return TIOCM_DSR | TIOCM_CAR;
}
static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)