Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f535733 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "sc16is7xx: implemented get_mctrl" 



This reverts commit a3f0b77f.

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3f0b77f

drivers/tty/serial/sc16is7xx.c

+4 −10
Original line number Original line Diff line number Diff line
@@ -822,16 +822,10 @@ static unsigned int sc16is7xx_tx_empty(struct uart_port *port) 




static unsigned int sc16is7xx_get_mctrl(struct uart_port *port)

static unsigned int sc16is7xx_get_mctrl(struct uart_port *port)

{

{

	unsigned int msr;

	/* DCD and DSR are not wired and CTS/RTS is handled automatically

	unsigned int ret = 0;

	 * so just indicate DSR and CAR asserted



	 */

	msr = sc16is7xx_port_read(port, SC16IS7XX_MSR_REG);

	return TIOCM_DSR | TIOCM_CAR;



	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;

}

}





static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)

static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)