diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-11 12:40:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 08:50:58 -0700 |
| commit | a391ad0f09014856bbc4eeea309593eba977b3b0 (patch) | |
| tree | b7ea4e108882e6e503978e52a62e88dc25a7b53c | |
| parent | 70beaed22cbe12979e55d99b370e147e2e168562 (diff) | |
| download | kernel_samsung_smdk4412-a391ad0f09014856bbc4eeea309593eba977b3b0.zip kernel_samsung_smdk4412-a391ad0f09014856bbc4eeea309593eba977b3b0.tar.gz kernel_samsung_smdk4412-a391ad0f09014856bbc4eeea309593eba977b3b0.tar.bz2 | |
rocket: fix test_bit parameters
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>
| -rw-r--r-- | 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..63d5b62 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(ASYNCB_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(ASYNCB_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(ASYNCB_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); |