lkml.org 
[lkml]   [2010]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] serial: amba-pl010: fix set_ldisc
    Date
    From: Mika Westerberg <mika.westerberg@iki.fi>

    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.

    Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
    Cc: Alan Cox <alan@linux.intel.com>
    Cc: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    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.7.2


    \
     
     \ /
      Last update: 2010-09-21 01:45    [W:0.020 / U:34.344 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site