lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

epca: fix test_bit parameters

Browse Source 
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>
This commit is contained in:
Jiri Slaby
2009-06-11 12:41:05 +01:00
committed by Linus Torvalds
parent a391ad0f09
commit c3301a5c04
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/char/epca.c
View File

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