diff options
| author | Jarod Wilson | 2010-10-09 20:07:06 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-10-21 05:18:36 +0200 |
| commit | 8be292cc035ebc3422f08e84682626dd8ed8334b (patch) | |
| tree | d9dee450677123f2f93a4dd7edb9d127d236c7e3 /drivers/staging/lirc/lirc_serial.c | |
| parent | [media] staging/lirc: ioctl portability fixups (diff) | |
| download | kernel-qcow2-linux-8be292cc035ebc3422f08e84682626dd8ed8334b.tar.gz kernel-qcow2-linux-8be292cc035ebc3422f08e84682626dd8ed8334b.tar.xz kernel-qcow2-linux-8be292cc035ebc3422f08e84682626dd8ed8334b.zip | |
[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/staging/lirc/lirc_serial.c')
| -rw-r--r-- | drivers/staging/lirc/lirc_serial.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c index 02906b432234..05a9bf3980ab 100644 --- a/drivers/staging/lirc/lirc_serial.c +++ b/drivers/staging/lirc/lirc_serial.c @@ -1053,6 +1053,9 @@ static const struct file_operations lirc_fops = { .owner = THIS_MODULE, .write = lirc_write, .unlocked_ioctl = lirc_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = lirc_ioctl, +#endif .read = lirc_dev_fop_read, .poll = lirc_dev_fop_poll, .open = lirc_dev_fop_open, |