lkml.org 
[lkml]   [2009]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] Char: rocket, fix ASYNC flags
    Date
    ASYNC_* flags are not bits, but rather constants, use ilog2 to obtain
    bit positions and stay atomic.

    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Ferenc Wagner <wferi@niif.hu>
    ---
    drivers/char/rocket.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
    index 7399188..38c18d3 100644
    --- a/drivers/char/rocket.c
    +++ b/drivers/char/rocket.c
    @@ -939,7 +939,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
    /*
    * Info->count is now 1; so it's safe to sleep now.
    */
    - if (!test_bit(ASYNC_INITIALIZED, &port->flags)) {
    + if (!test_bit(ilog2(ASYNC_INITIALIZED), &port->flags)) {
    cp = &info->channel;
    sSetRxTrigger(cp, TRIG_1);
    if (sGetChanStatus(cp) & CD_ACT)
    @@ -963,7 +963,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
    sEnRxFIFO(cp);
    sEnTransmit(cp);

    - set_bit(ASYNC_INITIALIZED, &info->port.flags);
    + set_bit(ilog2(ASYNC_INITIALIZED), &info->port.flags);

    /*
    * Set up the tty->alt_speed kludge
    @@ -1646,7 +1646,7 @@ static int rp_write(struct tty_struct *tty,
    /* Write remaining data into the port's xmit_buf */
    while (1) {
    /* Hung up ? */
    - if (!test_bit(ASYNC_NORMAL_ACTIVE, &info->port.flags))
    + if (!test_bit(ilog2(ASYNC_NORMAL_ACTIVE), &info->port.flags))
    goto end;
    c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1);
    c = min(c, XMIT_BUF_SIZE - info->xmit_head);
    --
    1.6.2.4


    \
     
     \ /
      Last update: 2009-05-08 10:37    [W:0.046 / U:0.008 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site