diff options
| author | David Härdeman <david@hardeman.nu> | 2014-11-20 18:09:54 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-16 09:37:08 -0800 |
| commit | 26366e61455f21778408b57901e7778dc45cddde (patch) | |
| tree | 90a01ee98ddb68daa85daa932e05052fa85cafac | |
| parent | adac476a1983459b0351903430c2f45e8d542570 (diff) | |
media: rc-core: fix toggle handling in the rc6 decoder
commit d2a74581390d8e5ed09b12c9d4736847d918dfa6 upstream.
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)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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; |