diff options
| author | David Härdeman <david@hardeman.nu> | 2014-11-20 18:09:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-21 15:57:47 -0200 |
| commit | d2a74581390d8e5ed09b12c9d4736847d918dfa6 (patch) | |
| tree | 8463ce0cb32972a7de8acd3ac7785a9f47edb861 /drivers/media/rc/ir-rc6-decoder.c | |
| parent | 009a5410337224896e300a570e185308836a2f14 (diff) | |
| download | lwn-d2a74581390d8e5ed09b12c9d4736847d918dfa6.tar.gz lwn-d2a74581390d8e5ed09b12c9d4736847d918dfa6.zip | |
[media] rc-core: fix toggle handling in the rc6 decoder
The toggle bit shouldn't be cleared before the toggle value is calculated.
This should probably go into 3.17.x as well.
Fixes: 120703f9eb32 ([media] rc-core: document the protocol type)
Cc: stable@vger.kernel.org # For v3.17
Tested-by: Stephan Raue <mailinglists@openelec.tv>
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/rc/ir-rc6-decoder.c')
| -rw-r--r-- | drivers/media/rc/ir-rc6-decoder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c index f1f098e22f7e..d16bc67af732 100644 --- a/drivers/media/rc/ir-rc6-decoder.c +++ b/drivers/media/rc/ir-rc6-decoder.c @@ -259,8 +259,8 @@ again: case 32: if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) { protocol = RC_TYPE_RC6_MCE; - scancode &= ~RC6_6A_MCE_TOGGLE_MASK; toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); + scancode &= ~RC6_6A_MCE_TOGGLE_MASK; } else { protocol = RC_BIT_RC6_6A_32; toggle = 0; |