summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@chromium.org>2015-03-09 17:37:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 22:05:27 +0100
commitda29169e769285e90bd1f8389c78b2da6e7fa910 (patch)
treee6cab3fff5d989cbae852f02fea77327b64ace14 /drivers
parentcaa445d808d27880f92d866902f6717f4d4cd3ca (diff)
downloadop-kernel-dev-da29169e769285e90bd1f8389c78b2da6e7fa910.zip
op-kernel-dev-da29169e769285e90bd1f8389c78b2da6e7fa910.tar.gz
serial: 8250_dw: fix 'cts-override'
We are dealing with CTS, not DSR here (we dealt with DSR a few lines above), so set appropriate bits. Reported-by: Kevin Cernekee <cernekee@chromium.org> Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/8250/8250_dw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 48a8bef..c536946 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -364,9 +364,9 @@ static int dw8250_probe_of(struct uart_port *p,
}
if (of_property_read_bool(np, "cts-override")) {
- /* Always report DSR as active */
- data->msr_mask_on |= UART_MSR_DSR;
- data->msr_mask_off |= UART_MSR_DDSR;
+ /* Always report CTS as active */
+ data->msr_mask_on |= UART_MSR_CTS;
+ data->msr_mask_off |= UART_MSR_DCTS;
}
if (of_property_read_bool(np, "ri-override")) {
OpenPOWER on IntegriCloud