diff options
| author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 14:12:29 -0500 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 14:12:29 -0500 |
| commit | a3550a9c543556cf7764be81aeb17c6dab440753 (patch) | |
| tree | e8c8bf721cc917c8842c4a007ad4b3f68eb7aa1e /drivers/net/hamradio/6pack.c | |
| parent | 9a14f2964b459c18198ee59ff7212321def82df7 (diff) | |
| parent | 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/hamradio/6pack.c')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 86b3bb9bec2d..92420f007b97 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
| @@ -914,7 +914,7 @@ static void decode_prio_command(struct sixpack *sp, unsigned char cmd) | |||
| 914 | printk(KERN_DEBUG "6pack: protocol violation\n"); | 914 | printk(KERN_DEBUG "6pack: protocol violation\n"); |
| 915 | else | 915 | else |
| 916 | sp->status = 0; | 916 | sp->status = 0; |
| 917 | cmd &= !SIXP_RX_DCD_MASK; | 917 | cmd &= ~SIXP_RX_DCD_MASK; |
| 918 | } | 918 | } |
| 919 | sp->status = cmd & SIXP_PRIO_DATA_MASK; | 919 | sp->status = cmd & SIXP_PRIO_DATA_MASK; |
| 920 | } else { /* output watchdog char if idle */ | 920 | } else { /* output watchdog char if idle */ |