p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] lirc: advertise LIRC_CAN_GET_REC_RESOLUTION and improve 

This feature was never set. The ioctl should fail if no resolution
is set.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sean Young 2017-02-08 20:48:17 -02:00 committed by Mauro Carvalho Chehab
parent 7dc2df1476
commit e8f4818895
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/rc/ir-lirc-codec.c
View File

@ -263,6 +263,9 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
return 0; return 0;
case LIRC_GET_REC_RESOLUTION: case LIRC_GET_REC_RESOLUTION:
if (!dev->rx_resolution)
return -ENOTTY;
val = dev->rx_resolution; val = dev->rx_resolution;
break; break;
@ -367,8 +370,11 @@ static int ir_lirc_register(struct rc_dev *dev)
if (rc) if (rc)
goto rbuf_init_failed; goto rbuf_init_failed;
if (dev->driver_type != RC_DRIVER_IR_RAW_TX) if (dev->driver_type != RC_DRIVER_IR_RAW_TX) {
features |= LIRC_CAN_REC_MODE2; features |= LIRC_CAN_REC_MODE2;
if (dev->rx_resolution)
features |= LIRC_CAN_GET_REC_RESOLUTION;
}
if (dev->tx_ir) { if (dev->tx_ir) {
features |= LIRC_CAN_SEND_PULSE; features |= LIRC_CAN_SEND_PULSE;
if (dev->s_tx_mask) if (dev->s_tx_mask)