linux: update MCE customer code restriction in rc6 patch

This commit is contained in:
MilhouseVH 2017-11-12 23:19:39 +00:00
parent 08b6402649
commit d843f694f0

View File

@ -1,5 +1,7 @@
--- linux/drivers/media/rc/ir-rc6-decoder.c 2012-11-25 22:08:13.148418669 -0800 diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
+++ linux.patch/drivers/media/rc/ir-rc6-decoder.c 2012-11-25 22:07:48.864417975 -0800 index 5d0d2fe..3d8cc1a 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
#define RC6_STARTBIT_MASK 0x08 /* for the header bits */ #define RC6_STARTBIT_MASK 0x08 /* for the header bits */
#define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */ #define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */
@ -8,19 +10,19 @@
#ifndef CHAR_BIT #ifndef CHAR_BIT
#define CHAR_BIT 8 /* Normally in <limits.h> */ #define CHAR_BIT 8 /* Normally in <limits.h> */
#endif #endif
@@ -257,14 +256,9 @@ again: @@ -252,14 +251,9 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
toggle = 0; toggle = 0;
break; break;
case 32: case 32:
- if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) { - if ((scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
- protocol = RC_TYPE_RC6_MCE; - protocol = RC_PROTO_RC6_MCE;
- toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); - toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
- scancode &= ~RC6_6A_MCE_TOGGLE_MASK; - scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
- } else { - } else {
- protocol = RC_TYPE_RC6_6A_32; - protocol = RC_PROTO_RC6_6A_32;
- toggle = 0; - toggle = 0;
- } - }
+ protocol = RC_TYPE_RC6_MCE; + protocol = RC_PROTO_RC6_MCE;
+ toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); + toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
+ scancode &= ~RC6_6A_MCE_TOGGLE_MASK; + scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
break; break;