[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100904072323.GR25559@gw.healthdatacare.com>
Date: Sat, 4 Sep 2010 10:23:23 +0300
From: Mika Westerberg <mika.westerberg@....fi>
To: linux-kernel@...r.kernel.org
Cc: Alan Cox <alan@...ux.intel.com>,
Russell King <rmk+kernel@....linux.org.uk>, gregkh@...e.de
Subject: Re: [PATCH] serial: amba-pl010: fix set_ldisc
On Sun, Aug 29, 2010 at 08:12:45PM +0300, Mika Westerberg wrote:
> Commit d87d9b7d1 ("tty: serial - fix tty referencing in set_ldisc") changed
> set_ldisc to take ldisc number as parameter. This patch fixes AMBA PL010 driver
> according the new prototype.
Hi,
If there are no objections, could this be merged? I CC'd Greg as I'm not sure
who is the serial maintainer.
Thanks,
MW
> Signed-off-by: Mika Westerberg <mika.westerberg@....fi>
> Cc: Alan Cox <alan@...ux.intel.com>
> Cc: Russell King <rmk+kernel@....linux.org.uk>
> ---
> drivers/serial/amba-pl010.c | 9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
> index 50441ff..2904aa0 100644
> --- a/drivers/serial/amba-pl010.c
> +++ b/drivers/serial/amba-pl010.c
> @@ -472,14 +472,9 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,
> spin_unlock_irqrestore(&uap->port.lock, flags);
> }
>
> -static void pl010_set_ldisc(struct uart_port *port)
> +static void pl010_set_ldisc(struct uart_port *port, int new)
> {
> - int line = port->line;
> -
> - if (line >= port->state->port.tty->driver->num)
> - return;
> -
> - if (port->state->port.tty->ldisc->ops->num == N_PPS) {
> + if (new == N_PPS) {
> port->flags |= UPF_HARDPPS_CD;
> pl010_enable_ms(port);
> } else
> --
> 1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists