diff options
author | Paul Fulghum <paulkf@microgate.com> | 2006-09-01 00:27:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 14:39:08 -0400 |
commit | 202af6d50155f8594ba01d8e0a54d77facc0152a (patch) | |
tree | 5f84f613d0304c990692de13e34708b020060f68 /drivers | |
parent | ddac7c7e3a0fe9cfdcef0de24476b8d69f8cf3e7 (diff) |
[PATCH] synclink_gt: fix receive tty error handling
Fix receive tty error handling in synclink_gt driver. Adrian reported
compiler warning for incorrect bit test against char variable. I
determined these and other device specific error bits were incorrectly
defined.
Signed-off-by: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/synclink_gt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c index b2dbbdb1bf81..2f07b085536b 100644 --- a/drivers/char/synclink_gt.c +++ b/drivers/char/synclink_gt.c | |||
@@ -391,8 +391,8 @@ static MGSL_PARAMS default_params = { | |||
391 | #define DESC_LIST_SIZE 4096 | 391 | #define DESC_LIST_SIZE 4096 |
392 | 392 | ||
393 | #define MASK_PARITY BIT1 | 393 | #define MASK_PARITY BIT1 |
394 | #define MASK_FRAMING BIT2 | 394 | #define MASK_FRAMING BIT0 |
395 | #define MASK_BREAK BIT3 | 395 | #define MASK_BREAK BIT14 |
396 | #define MASK_OVERRUN BIT4 | 396 | #define MASK_OVERRUN BIT4 |
397 | 397 | ||
398 | #define GSR 0x00 /* global status */ | 398 | #define GSR 0x00 /* global status */ |
@@ -1800,17 +1800,17 @@ static void rx_async(struct slgt_info *info) | |||
1800 | 1800 | ||
1801 | stat = 0; | 1801 | stat = 0; |
1802 | 1802 | ||
1803 | if ((status = *(p+1) & (BIT9 + BIT8))) { | 1803 | if ((status = *(p+1) & (BIT1 + BIT0))) { |
1804 | if (status & BIT9) | 1804 | if (status & BIT1) |
1805 | icount->parity++; | 1805 | icount->parity++; |
1806 | else if (status & BIT8) | 1806 | else if (status & BIT0) |
1807 | icount->frame++; | 1807 | icount->frame++; |
1808 | /* discard char if tty control flags say so */ | 1808 | /* discard char if tty control flags say so */ |
1809 | if (status & info->ignore_status_mask) | 1809 | if (status & info->ignore_status_mask) |
1810 | continue; | 1810 | continue; |
1811 | if (status & BIT9) | 1811 | if (status & BIT1) |
1812 | stat = TTY_PARITY; | 1812 | stat = TTY_PARITY; |
1813 | else if (status & BIT8) | 1813 | else if (status & BIT0) |
1814 | stat = TTY_FRAME; | 1814 | stat = TTY_FRAME; |
1815 | } | 1815 | } |
1816 | if (tty) { | 1816 | if (tty) { |