diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-11 07:40:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:50:58 -0400 |
commit | a391ad0f09014856bbc4eeea309593eba977b3b0 (patch) | |
tree | b7ea4e108882e6e503978e52a62e88dc25a7b53c /drivers/char/rocket.c | |
parent | 70beaed22cbe12979e55d99b370e147e2e168562 (diff) |
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>
Diffstat (limited to 'drivers/char/rocket.c')
-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 7399188049d8..63d5b628477a 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) | |||
939 | /* | 939 | /* |
940 | * Info->count is now 1; so it's safe to sleep now. | 940 | * Info->count is now 1; so it's safe to sleep now. |
941 | */ | 941 | */ |
942 | if (!test_bit(ASYNC_INITIALIZED, &port->flags)) { | 942 | if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) { |
943 | cp = &info->channel; | 943 | cp = &info->channel; |
944 | sSetRxTrigger(cp, TRIG_1); | 944 | sSetRxTrigger(cp, TRIG_1); |
945 | if (sGetChanStatus(cp) & CD_ACT) | 945 | if (sGetChanStatus(cp) & CD_ACT) |
@@ -963,7 +963,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp) | |||
963 | sEnRxFIFO(cp); | 963 | sEnRxFIFO(cp); |
964 | sEnTransmit(cp); | 964 | sEnTransmit(cp); |
965 | 965 | ||
966 | set_bit(ASYNC_INITIALIZED, &info->port.flags); | 966 | set_bit(ASYNCB_INITIALIZED, &info->port.flags); |
967 | 967 | ||
968 | /* | 968 | /* |
969 | * Set up the tty->alt_speed kludge | 969 | * Set up the tty->alt_speed kludge |
@@ -1646,7 +1646,7 @@ static int rp_write(struct tty_struct *tty, | |||
1646 | /* Write remaining data into the port's xmit_buf */ | 1646 | /* Write remaining data into the port's xmit_buf */ |
1647 | while (1) { | 1647 | while (1) { |
1648 | /* Hung up ? */ | 1648 | /* Hung up ? */ |
1649 | if (!test_bit(ASYNC_NORMAL_ACTIVE, &info->port.flags)) | 1649 | if (!test_bit(ASYNCB_NORMAL_ACTIVE, &info->port.flags)) |
1650 | goto end; | 1650 | goto end; |
1651 | c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1); | 1651 | c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1); |
1652 | c = min(c, XMIT_BUF_SIZE - info->xmit_head); | 1652 | c = min(c, XMIT_BUF_SIZE - info->xmit_head); |