lkml.org 
[lkml]   [2011]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/1] Char: moxa, do not touch NORMAL_ACTIVE bit
    Date
    The bit is set in tty_port_block_til_ready (via moxa_open) and unset
    in tty_port_close (via moxa_close). No need to pin it in the driver.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/tty/moxa.c | 7 +------
    1 files changed, 1 insertions(+), 6 deletions(-)

    diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
    index ffdaab3..a290e9e 100644
    --- a/drivers/tty/moxa.c
    +++ b/drivers/tty/moxa.c
    @@ -1129,7 +1129,6 @@ static void moxa_shutdown(struct tty_port *port)
    struct moxa_port *ch = container_of(port, struct moxa_port, port);
    MoxaPortDisable(ch);
    MoxaPortFlushData(ch, 2);
    - clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
    }

    static int moxa_carrier_raised(struct tty_port *port)
    @@ -1155,7 +1154,6 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
    struct moxa_board_conf *brd;
    struct moxa_port *ch;
    int port;
    - int retval;

    port = tty->index;
    if (port == MAX_PORTS) {
    @@ -1190,10 +1188,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
    mutex_unlock(&ch->port.mutex);
    mutex_unlock(&moxa_openlock);

    - retval = tty_port_block_til_ready(&ch->port, tty, filp);
    - if (retval == 0)
    - set_bit(ASYNCB_NORMAL_ACTIVE, &ch->port.flags);
    - return retval;
    + return tty_port_block_til_ready(&ch->port, tty, filp);
    }

    static void moxa_close(struct tty_struct *tty, struct file *filp)
    --
    1.7.4.1



    \
     
     \ /
      Last update: 2011-03-29 23:25    [W:0.020 / U:60.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site