Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
rc
/
ir-lirc-codec.c
diff --git
a/kernel/drivers/media/rc/ir-lirc-codec.c
b/kernel/drivers/media/rc/ir-lirc-codec.c
index
98893a8
..
a32659f
100644
(file)
--- a/
kernel/drivers/media/rc/ir-lirc-codec.c
+++ b/
kernel/drivers/media/rc/ir-lirc-codec.c
@@
-35,9
+35,6
@@
static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
struct lirc_codec *lirc = &dev->raw->lirc;
int sample;
struct lirc_codec *lirc = &dev->raw->lirc;
int sample;
- if (!(dev->enabled_protocols & RC_BIT_LIRC))
- return 0;
-
if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
return -EINVAL;
if (!dev->raw->lirc.drv || !dev->raw->lirc.drv->rbuf)
return -EINVAL;
@@
-424,7
+421,7
@@
static int ir_lirc_unregister(struct rc_dev *dev)
}
static struct ir_raw_handler lirc_handler = {
}
static struct ir_raw_handler lirc_handler = {
- .protocols =
RC_BIT_LIRC
,
+ .protocols =
0
,
.decode = ir_lirc_decode,
.raw_register = ir_lirc_register,
.raw_unregister = ir_lirc_unregister,
.decode = ir_lirc_decode,
.raw_register = ir_lirc_register,
.raw_unregister = ir_lirc_unregister,