diff options
| author | Sean Young | 2017-08-03 23:42:28 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-08-20 15:51:01 +0200 |
| commit | 89d8a2cc51d1f29ea24a0b44dde13253141190a0 (patch) | |
| tree | b690ceb458de4b1c0d9e540959b022a6524af74d /drivers/staging | |
| parent | media: rc: add zx-irdec remote control driver (diff) | |
| download | kernel-qcow2-linux-89d8a2cc51d1f29ea24a0b44dde13253141190a0.tar.gz kernel-qcow2-linux-89d8a2cc51d1f29ea24a0b44dde13253141190a0.tar.xz kernel-qcow2-linux-89d8a2cc51d1f29ea24a0b44dde13253141190a0.zip | |
media: lirc_zilog: driver only sends LIRCCODE
This driver cannot send pulse, it only accepts driver-dependent codes.
Cc: <stable@vger.kernel.org> # v3.2
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_zilog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index 26dd32d5b5b2..71af13bd0ebd 100644 --- a/drivers/staging/media/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c @@ -288,7 +288,7 @@ static void release_ir_tx(struct kref *ref) 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); @@ -1267,14 +1267,14 @@ static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg) if (!(features & LIRC_CAN_SEND_MASK)) return -ENOTTY; - 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 -ENOTTY; result = get_user(mode, uptr); - if (!result && mode != LIRC_MODE_PULSE) + if (!result && mode != LIRC_MODE_LIRCCODE) return -EINVAL; break; default: @@ -1512,7 +1512,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) 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; |