diff options
author | Jarod Wilson <jarod@redhat.com> | 2010-10-09 14:07:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:18:36 -0400 |
commit | 8be292cc035ebc3422f08e84682626dd8ed8334b (patch) | |
tree | d9dee450677123f2f93a4dd7edb9d127d236c7e3 /drivers/media/IR/ir-lirc-codec.c | |
parent | a126681810a327bee60a58ac5ad77f4518cf7a5f (diff) |
[media] lirc: wire up .compat_ioctl to main ioctl handler
As pointed out (and tested) by Joris van Rantwijk, we do actually need
to wire up .compat_ioctl for 32-bit lirc userspace to work with 64-bit
lirc kernelspace. Do it. And add a check to make sure we get a valid
irctl in the ioctl handler.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR/ir-lirc-codec.c')
-rw-r--r-- | drivers/media/IR/ir-lirc-codec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/IR/ir-lirc-codec.c index c6d5b3eb1325..20ac9a4ce522 100644 --- a/drivers/media/IR/ir-lirc-codec.c +++ b/drivers/media/IR/ir-lirc-codec.c | |||
@@ -231,6 +231,9 @@ static struct file_operations lirc_fops = { | |||
231 | .owner = THIS_MODULE, | 231 | .owner = THIS_MODULE, |
232 | .write = ir_lirc_transmit_ir, | 232 | .write = ir_lirc_transmit_ir, |
233 | .unlocked_ioctl = ir_lirc_ioctl, | 233 | .unlocked_ioctl = ir_lirc_ioctl, |
234 | #ifdef CONFIG_COMPAT | ||
235 | .compat_ioctl = ir_lirc_ioctl, | ||
236 | #endif | ||
234 | .read = lirc_dev_fop_read, | 237 | .read = lirc_dev_fop_read, |
235 | .poll = lirc_dev_fop_poll, | 238 | .poll = lirc_dev_fop_poll, |
236 | .open = lirc_dev_fop_open, | 239 | .open = lirc_dev_fop_open, |