[PATCH 3.16 044/133] media: lirc_zilog: driver only sends LIRCCODE

[Ben Hutchings]

3.16.51-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Sean Young <s...@mess.org>

commit 89d8a2cc51d1f29ea24a0b44dde13253141190a0 upstream.

This driver cannot send pulse, it only accepts driver-dependent codes.

Signed-off-by: Sean Young <s...@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 drivers/staging/media/lirc/lirc_zilog.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -300,7 +300,7 @@ static void release_ir_tx(struct kref *r
        struct IR_tx *tx = container_of(ref, struct IR_tx, ref);
        struct IR *ir = tx->ir;
 
-       ir->l.features &= ~LIRC_CAN_SEND_PULSE;
+       ir->l.features &= ~LIRC_CAN_SEND_LIRCCODE;
        /* Don't put_ir_device(tx->ir) here, so our lock doesn't get freed */
        ir->tx = NULL;
        kfree(tx);
@@ -1271,14 +1271,14 @@ static long ioctl(struct file *filep, un
                if (!(features&LIRC_CAN_SEND_MASK))
                        return -ENOSYS;
 
-               result = put_user(LIRC_MODE_PULSE, uptr);
+               result = put_user(LIRC_MODE_LIRCCODE, uptr);
                break;
        case LIRC_SET_SEND_MODE:
                if (!(features&LIRC_CAN_SEND_MASK))
                        return -ENOSYS;
 
                result = get_user(mode, uptr);
-               if (!result && mode != LIRC_MODE_PULSE)
+               if (!result && mode != LIRC_MODE_LIRCCODE)
                        return -EINVAL;
                break;
        default:
@@ -1516,7 +1516,7 @@ static int ir_probe(struct i2c_client *c
                kref_init(&tx->ref);
                ir->tx = tx;
 
-               ir->l.features |= LIRC_CAN_SEND_PULSE;
+               ir->l.features |= LIRC_CAN_SEND_LIRCCODE;
                mutex_init(&tx->client_lock);
                tx->c = client;
                tx->need_boot = 1;