git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
drivers
/
media
/
IR
/
ir-rc6-decoder.c
diff --git
a/drivers/media/IR/ir-rc6-decoder.c
b/drivers/media/IR/ir-rc6-decoder.c
index
f1624b8
..
d25da91
100644
(file)
--- a/
drivers/media/IR/ir-rc6-decoder.c
+++ b/
drivers/media/IR/ir-rc6-decoder.c
@@
-85,8
+85,9
@@
static int ir_rc6_decode(struct input_dev *input_dev, struct ir_raw_event ev)
if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC6))
return 0;
- if (IS_RESET(ev)) {
- data->state = STATE_INACTIVE;
+ if (!is_timing_event(ev)) {
+ if (ev.reset)
+ data->state = STATE_INACTIVE;
return 0;
}