If the device cannot transmit then -ENOSYS should be returned. Also clarify
that the ioctl should return modes, not features. The values happen to be
identical.

Signed-off-by: Sean Young <s...@mess.org>
---
 drivers/media/rc/ir-lirc-codec.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 98893a8..17fd956 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -207,12 +207,19 @@ static long ir_lirc_ioctl(struct file *filep, unsigned 
int cmd,
 
        /* legacy support */
        case LIRC_GET_SEND_MODE:
-               val = LIRC_CAN_SEND_PULSE & LIRC_CAN_SEND_MASK;
+               if (!(dev->lirc->features & LIRC_CAN_SEND_MASK))
+                       return -ENOSYS;
+
+               val = LIRC_MODE_PULSE;
                break;
 
        case LIRC_SET_SEND_MODE:
-               if (val != (LIRC_MODE_PULSE & LIRC_CAN_SEND_MASK))
+               if (!(dev->lirc->features & LIRC_CAN_SEND_MASK))
+                       return -ENOSYS;
+
+               if (val != LIRC_MODE_PULSE)
                        return -EINVAL;
+
                return 0;
 
        /* TX settings */
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to