]> git.karo-electronics.de Git - linux-beck.git/commitdiff
serial: mxs-auart: Fix mxs_auart_set_ldisc()
authorFabio Estevam <fabio.estevam@freescale.com>
Wed, 12 Nov 2014 22:32:49 +0000 (20:32 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Nov 2014 01:06:39 +0000 (17:06 -0800)
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>
drivers/tty/serial/mxs-auart.c

index 386b528940560396158fdd17673ada88a7163589..0262a6a5083446b61b48139e3868a541787dc964 100644 (file)
@@ -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 {