diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-13 01:32:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 04:06:39 +0300 |
| commit | f3006e44dd3dc0f2d0ce636585ed95d5b4ad6f35 (patch) | |
| tree | b7a82a5c8b67a9f7859c82b3dde3596e32cd9b94 /drivers/tty | |
| parent | bca2092d78970df3959462d2aae1941e6b24ebdf (diff) | |
| download | linux-f3006e44dd3dc0f2d0ce636585ed95d5b4ad6f35.tar.xz | |
serial: mxs-auart: Fix mxs_auart_set_ldisc()
Commit 732a84a037a4 ("serial: core: Pass termios to set_ldisc() notifications")
changed the set_ldisc prototype.
At the time of this commit the mxs_auart driver did not implement set_ldisc,
so that's why it has not been converted.
Adapt also mxs_auart_set_ldisc() so that the following build warning can be
fixed:
drivers/tty/serial/mxs-auart.c:962:2: warning: initialization from
incompatible pointer type
.set_ldisc = mxs_auart_set_ldisc,
^
drivers/tty/serial/mxs-auart.c:962:2: warning: (near initialization
for 'mxs_auart_ops.set_ldisc')
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Janusz Uzycki <j.uzycki@elproma.com.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/mxs-auart.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 386b52894056..0262a6a50834 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -784,9 +784,10 @@ static void mxs_auart_settermios(struct uart_port *u, mxs_auart_disable_ms(u); } -static void mxs_auart_set_ldisc(struct uart_port *port, int new) +static void mxs_auart_set_ldisc(struct uart_port *port, + struct ktermios *termios) { - if (new == N_PPS) { + if (termios->c_line == N_PPS) { port->flags |= UPF_HARDPPS_CD; mxs_auart_enable_ms(port); } else { |