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

[David Härdeman]

On Tue, Oct 28, 2014 at 08:43:14PM +0200, Tomas Melin wrote:
>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 da6e162d6a4607362f8478c715c797d84d449f8b
>("[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.
>
>Signed-off-by: Tomas Melin <tomas.melin@xxxxxx>

Acked-by: David Härdeman <david@xxxxxxxxxxx>

>---
> drivers/media/rc/rc-ir-raw.c |    1 -
> drivers/media/rc/rc-main.c   |    2 ++
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
>index e8fff2a..b732ac6 100644
>--- a/drivers/media/rc/rc-ir-raw.c
>+++ b/drivers/media/rc/rc-ir-raw.c
>@@ -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,
>diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
>index a7991c7..8d3b74c 100644
>--- a/drivers/media/rc/rc-main.c
>+++ b/drivers/media/rc/rc-main.c
>@@ -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;
>-- 
>1.7.10.4
>

-- 
David Härdeman
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/