Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33754
b: refs/heads/master
c: 202af6d
h: refs/heads/master
v: v3
  • Loading branch information
Paul Fulghum authored and Linus Torvalds committed Sep 1, 2006
1 parent 4e2f741 commit 80a4345
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ddac7c7e3a0fe9cfdcef0de24476b8d69f8cf3e7
refs/heads/master: 202af6d50155f8594ba01d8e0a54d77facc0152a
14 changes: 7 additions & 7 deletions trunk/drivers/char/synclink_gt.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ static MGSL_PARAMS default_params = {
#define DESC_LIST_SIZE 4096

#define MASK_PARITY BIT1
#define MASK_FRAMING BIT2
#define MASK_BREAK BIT3
#define MASK_FRAMING BIT0
#define MASK_BREAK BIT14
#define MASK_OVERRUN BIT4

#define GSR 0x00 /* global status */
Expand Down Expand Up @@ -1800,17 +1800,17 @@ static void rx_async(struct slgt_info *info)

stat = 0;

if ((status = *(p+1) & (BIT9 + BIT8))) {
if (status & BIT9)
if ((status = *(p+1) & (BIT1 + BIT0))) {
if (status & BIT1)
icount->parity++;
else if (status & BIT8)
else if (status & BIT0)
icount->frame++;
/* discard char if tty control flags say so */
if (status & info->ignore_status_mask)
continue;
if (status & BIT9)
if (status & BIT1)
stat = TTY_PARITY;
else if (status & BIT8)
else if (status & BIT0)
stat = TTY_FRAME;
}
if (tty) {
Expand Down

0 comments on commit 80a4345

Please sign in to comment.