summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/ir-lirc-codec.c
diff options
context:
space:
mode:
authorSean Young2017-01-19 22:27:17 +0100
committerMauro Carvalho Chehab2017-01-31 10:28:18 +0100
commitc9bbd5661fa85e086ee52aa5905b62d14ee8b7a3 (patch)
tree43e702945478f50d96d6762dc7182b26f2a29547 /drivers/media/rc/ir-lirc-codec.c
parent[media] rc/keymaps: add a keytable for the GeekBox remote control (diff)
downloadkernel-qcow2-linux-c9bbd5661fa85e086ee52aa5905b62d14ee8b7a3.tar.gz
kernel-qcow2-linux-c9bbd5661fa85e086ee52aa5905b62d14ee8b7a3.tar.xz
kernel-qcow2-linux-c9bbd5661fa85e086ee52aa5905b62d14ee8b7a3.zip
[media] lirc: fix transmit-only read features
An RC device which is transmit-only shouldn't have the LIRC_CAN_REC_MODE2 feature. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/rc/ir-lirc-codec.c')
-rw-r--r--drivers/media/rc/ir-lirc-codec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 9e41305ad32e..e944507fc4f5 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -347,7 +347,7 @@ static int ir_lirc_register(struct rc_dev *dev)
struct lirc_driver *drv;
struct lirc_buffer *rbuf;
int rc = -ENOMEM;
- unsigned long features;
+ unsigned long features = 0;
drv = kzalloc(sizeof(struct lirc_driver), GFP_KERNEL);
if (!drv)
@@ -361,7 +361,8 @@ static int ir_lirc_register(struct rc_dev *dev)
if (rc)
goto rbuf_init_failed;
- features = LIRC_CAN_REC_MODE2;
+ if (dev->driver_type != RC_DRIVER_IR_RAW_TX)
+ features |= LIRC_CAN_REC_MODE2;
if (dev->tx_ir) {
features |= LIRC_CAN_SEND_PULSE;
if (dev->s_tx_mask)