diff options
Diffstat (limited to 'drivers/media/rc/ir-rc6-decoder.c')
-rw-r--r-- | drivers/media/rc/ir-rc6-decoder.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c index 4cfdd7fa4bbd..e19072ffb36c 100644 --- a/drivers/media/rc/ir-rc6-decoder.c +++ b/drivers/media/rc/ir-rc6-decoder.c | |||
@@ -89,7 +89,9 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
89 | u32 scancode; | 89 | u32 scancode; |
90 | u8 toggle; | 90 | u8 toggle; |
91 | 91 | ||
92 | if (!(dev->raw->enabled_protocols & RC_TYPE_RC6)) | 92 | if (!(dev->raw->enabled_protocols & |
93 | (RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | | ||
94 | RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE))) | ||
93 | return 0; | 95 | return 0; |
94 | 96 | ||
95 | if (!is_timing_event(ev)) { | 97 | if (!is_timing_event(ev)) { |
@@ -271,7 +273,9 @@ out: | |||
271 | } | 273 | } |
272 | 274 | ||
273 | static struct ir_raw_handler rc6_handler = { | 275 | static struct ir_raw_handler rc6_handler = { |
274 | .protocols = RC_TYPE_RC6, | 276 | .protocols = RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | |
277 | RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | | ||
278 | RC_BIT_RC6_MCE, | ||
275 | .decode = ir_rc6_decode, | 279 | .decode = ir_rc6_decode, |
276 | }; | 280 | }; |
277 | 281 | ||