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

rocket: fix test_bit parameters

Browse Source 
Switch from ASYNC_* to ASYNCB_*, because {test,set}_bit expect
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:40:17 +01:00
committed by Linus Torvalds
parent 70beaed22c
commit a391ad0f09
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/rocket.c
View File

@@ -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. * Info->count is now 1; so it's safe to sleep now.
*/ */
if (!test_bit(ASYNC_INITIALIZED, &port->flags)) { if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
cp = &info->channel; cp = &info->channel;
sSetRxTrigger(cp, TRIG_1); sSetRxTrigger(cp, TRIG_1);
if (sGetChanStatus(cp) & CD_ACT) if (sGetChanStatus(cp) & CD_ACT)
@@ -963,7 +963,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
sEnRxFIFO(cp); sEnRxFIFO(cp);
sEnTransmit(cp); sEnTransmit(cp);
set_bit(ASYNC_INITIALIZED, &info->port.flags); set_bit(ASYNCB_INITIALIZED, &info->port.flags);
/* /*
* Set up the tty->alt_speed kludge * 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 */ /* Write remaining data into the port's xmit_buf */
while (1) { while (1) {
/* Hung up ? */ /* Hung up ? */
if (!test_bit(ASYNC_NORMAL_ACTIVE, &info->port.flags)) if (!test_bit(ASYNCB_NORMAL_ACTIVE, &info->port.flags))
goto end; goto end;
c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1); c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1);
c = min(c, XMIT_BUF_SIZE - info->xmit_head); c = min(c, XMIT_BUF_SIZE - info->xmit_head);