lkml.org 
[lkml]   [2009]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 029/108] epca: fix test_bit parameters
    2.6.30-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Jiri Slaby <jirislaby@gmail.com>

    commit c3301a5c04800bcf8afc8a815bf9e570a4e25a08 upstream.

    Switch from ASYNC_* to ASYNCB_*, because test_bit expects
    bit number, not mask.

    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/char/epca.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/char/epca.c
    +++ b/drivers/char/epca.c
    @@ -1518,7 +1518,7 @@ static void doevent(int crd)
    if (event & MODEMCHG_IND) {
    /* A modem signal change has been indicated */
    ch->imodem = mstat;
    - if (test_bit(ASYNC_CHECK_CD, &ch->port.flags)) {
    + if (test_bit(ASYNCB_CHECK_CD, &ch->port.flags)) {
    /* We are now receiving dcd */
    if (mstat & ch->dcd)
    wake_up_interruptible(&ch->port.open_wait);
    @@ -1765,9 +1765,9 @@ static void epcaparam(struct tty_struct
    * that the driver will wait on carrier detect.
    */
    if (ts->c_cflag & CLOCAL)
    - clear_bit(ASYNC_CHECK_CD, &ch->port.flags);
    + clear_bit(ASYNCB_CHECK_CD, &ch->port.flags);
    else
    - set_bit(ASYNC_CHECK_CD, &ch->port.flags);
    + set_bit(ASYNCB_CHECK_CD, &ch->port.flags);
    mval = ch->m_dtr | ch->m_rts;
    } /* End CBAUD not detected */
    iflag = termios2digi_i(ch, ts->c_iflag);
    @@ -2244,7 +2244,8 @@ static void do_softint(struct work_struc
    if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {
    tty_hangup(tty);
    wake_up_interruptible(&ch->port.open_wait);
    - clear_bit(ASYNC_NORMAL_ACTIVE, &ch->port.flags);
    + clear_bit(ASYNCB_NORMAL_ACTIVE,
    + &ch->port.flags);
    }
    }
    tty_kref_put(tty);



    \
     
     \ /
      Last update: 2009-07-01 03:09    [W:0.025 / U:32.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site