Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be292cc authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a1266818

drivers/media/IR/ir-lirc-codec.c

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ static struct file_operations lirc_fops = { 
	.owner		= THIS_MODULE,

	.write		= ir_lirc_transmit_ir,

	.unlocked_ioctl	= ir_lirc_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= ir_lirc_ioctl,

#endif

	.read		= lirc_dev_fop_read,

	.poll		= lirc_dev_fop_poll,

	.open		= lirc_dev_fop_open,

drivers/media/IR/lirc_dev.c

+8 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ static struct file_operations fops = { 
	.write		= lirc_dev_fop_write,

	.poll		= lirc_dev_fop_poll,

	.unlocked_ioctl	= lirc_dev_fop_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= lirc_dev_fop_ioctl,

#endif

	.open		= lirc_dev_fop_open,

	.release	= lirc_dev_fop_close,

};
@@ -528,6 +531,11 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	int result = 0;

	struct irctl *ir = file->private_data;



	if (!ir) {

		printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);

		return -ENODEV;

	}



	dev_dbg(ir->d.dev, LOGHEAD "ioctl called (0x%x)\n",

		ir->d.name, ir->d.minor, cmd);

drivers/staging/lirc/lirc_it87.c

+3 −0
Original line number Diff line number Diff line
@@ -339,6 +339,9 @@ static const struct file_operations lirc_fops = { 
	.write		= lirc_write,

	.poll		= lirc_poll,

	.unlocked_ioctl	= lirc_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= lirc_ioctl,

#endif

	.open		= lirc_open,

	.release	= lirc_close,

};

drivers/staging/lirc/lirc_parallel.c

+3 −0
Original line number Diff line number Diff line
@@ -546,6 +546,9 @@ static const struct file_operations lirc_fops = { 
	.write		= lirc_write,

	.poll		= lirc_poll,

	.unlocked_ioctl	= lirc_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= lirc_ioctl,

#endif

	.open		= lirc_open,

	.release	= lirc_close

};

drivers/staging/lirc/lirc_serial.c

+3 −0
Original line number Diff line number Diff line
@@ -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,