Commit 14edb593 authored Oct 28, 2014 by Tomas Melin Committed by Mauro Carvalho Chehab Oct 30, 2014

[media] rc-core: fix protocol_change regression in ir_raw_event_register



IR receiver using nuvoton-cir and lirc required additional configuration
steps after upgrade from kernel 3.16 to 3.17-rcX. Bisected regression to
commit da6e162d ("[media] rc-core:
simplify sysfs code").

The regression comes from adding function change_protocol in ir-raw.c.
It changes behaviour so that only the protocol enabled by driver's
map_name will be active after registration. This breaks user space
behaviour, lirc does not get key press signals anymore.

Enable lirc protocol by default for ir raw decoders to restore original
behaviour.

Cc: stable@vger.kernel.org # for v3.17
Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent f7e87a44

drivers/media/rc/rc-ir-raw.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,6 @@ int ir_raw_event_register(struct rc_dev *dev)
		return -ENOMEM;

		dev->raw->dev = dev;
		dev->enabled_protocols = ~0;
		dev->change_protocol = change_protocol;
		rc = kfifo_alloc(&dev->raw->kfifo,
		sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,

drivers/media/rc/rc-main.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1421,6 +1421,8 @@ int rc_register_device(struct rc_dev *dev)

		if (dev->change_protocol) {
		u64 rc_type = (1 << rc_map->rc_type);
		if (dev->driver_type == RC_DRIVER_IR_RAW)
		rc_type \|= RC_BIT_LIRC;
		rc = dev->change_protocol(dev, &rc_type);
		if (rc < 0)
		goto out_raw;