summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-08 03:10:08 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-08 03:10:08 +0300
commit5f5357335e2816ec3f9fe62337bc8dc1725992e8 (patch)
treeed320bb25f13b3a088440d8d8bcfae9050c60c37 /drivers/tty
parenta3f0b77f36ca5c5871fb8daf7e66fa409abe1ed5 (diff)
downloadlinux-5f5357335e2816ec3f9fe62337bc8dc1725992e8.tar.xz
Revert "sc16is7xx: implemented get_mctrl"
This reverts commit a3f0b77f36ca5c5871fb8daf7e66fa409abe1ed5. 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
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sc16is7xx.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index e78fa99475c0..025a4264430e 100644
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -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)