aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-12 17:32:49 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-25 20:06:39 -0500
commitf3006e44dd3dc0f2d0ce636585ed95d5b4ad6f35 (patch)
treeb7a82a5c8b67a9f7859c82b3dde3596e32cd9b94
parentbca2092d78970df3959462d2aae1941e6b24ebdf (diff)
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>
-rw-r--r--drivers/tty/serial/mxs-auart.c5
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,
784 mxs_auart_disable_ms(u); 784 mxs_auart_disable_ms(u);
785} 785}
786 786
787static void mxs_auart_set_ldisc(struct uart_port *port, int new) 787static void mxs_auart_set_ldisc(struct uart_port *port,
788 struct ktermios *termios)
788{ 789{
789 if (new == N_PPS) { 790 if (termios->c_line == N_PPS) {
790 port->flags |= UPF_HARDPPS_CD; 791 port->flags |= UPF_HARDPPS_CD;
791 mxs_auart_enable_ms(port); 792 mxs_auart_enable_ms(port);
792 } else { 793 } else {