Commit 67f0f15a authored by Sean Young's avatar Sean Young Committed by Mauro Carvalho Chehab
Browse files

media: rc: partial revert of "media: rc: per-protocol repeat period" 



Since commit d57ea877 ("media: rc: per-protocol repeat period"), most
IR protocols have a lower keyup timeout. This causes problems on the
ite-cir, which has default IR timeout of 200ms.

Since the IR decoders read the trailing space, with a IR timeout of 200ms,
the last keydown will have at least a delay of 200ms. This is more than
the protocol timeout of e.g. rc-6 (which is 164ms). As a result the last
IR will be interpreted as a new keydown event, and we get two keypresses.

Revert the protocol timeout to 250ms, except for cec which needs a timeout
of 550ms.

Fixes: d57ea877 ("media: rc: per-protocol repeat period")

Cc: <stable@vger.kernel.org> # 4.14
Reported-by: default avatarMatthias Reichl <hias@horus.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Tested-by: default avatarMatthias Reichl <hias@horus.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6d33377f

drivers/media/rc/rc-main.c

+16 −16
Original line number Diff line number Diff line
@@ -39,41 +39,41 @@ static const struct { 
	[RC_PROTO_UNKNOWN] = { .name = "unknown", .repeat_period = 250 },

	[RC_PROTO_OTHER] = { .name = "other", .repeat_period = 250 },

	[RC_PROTO_RC5] = { .name = "rc-5",

		.scancode_bits = 0x1f7f, .repeat_period = 164 },

		.scancode_bits = 0x1f7f, .repeat_period = 250 },

	[RC_PROTO_RC5X_20] = { .name = "rc-5x-20",

		.scancode_bits = 0x1f7f3f, .repeat_period = 164 },

		.scancode_bits = 0x1f7f3f, .repeat_period = 250 },

	[RC_PROTO_RC5_SZ] = { .name = "rc-5-sz",

		.scancode_bits = 0x2fff, .repeat_period = 164 },

		.scancode_bits = 0x2fff, .repeat_period = 250 },

	[RC_PROTO_JVC] = { .name = "jvc",

		.scancode_bits = 0xffff, .repeat_period = 250 },

	[RC_PROTO_SONY12] = { .name = "sony-12",

		.scancode_bits = 0x1f007f, .repeat_period = 100 },

		.scancode_bits = 0x1f007f, .repeat_period = 250 },

	[RC_PROTO_SONY15] = { .name = "sony-15",

		.scancode_bits = 0xff007f, .repeat_period = 100 },

		.scancode_bits = 0xff007f, .repeat_period = 250 },

	[RC_PROTO_SONY20] = { .name = "sony-20",

		.scancode_bits = 0x1fff7f, .repeat_period = 100 },

		.scancode_bits = 0x1fff7f, .repeat_period = 250 },

	[RC_PROTO_NEC] = { .name = "nec",

		.scancode_bits = 0xffff, .repeat_period = 160 },

		.scancode_bits = 0xffff, .repeat_period = 250 },

	[RC_PROTO_NECX] = { .name = "nec-x",

		.scancode_bits = 0xffffff, .repeat_period = 160 },

		.scancode_bits = 0xffffff, .repeat_period = 250 },

	[RC_PROTO_NEC32] = { .name = "nec-32",

		.scancode_bits = 0xffffffff, .repeat_period = 160 },

		.scancode_bits = 0xffffffff, .repeat_period = 250 },

	[RC_PROTO_SANYO] = { .name = "sanyo",

		.scancode_bits = 0x1fffff, .repeat_period = 250 },

	[RC_PROTO_MCIR2_KBD] = { .name = "mcir2-kbd",

		.scancode_bits = 0xffff, .repeat_period = 150 },

		.scancode_bits = 0xffff, .repeat_period = 250 },

	[RC_PROTO_MCIR2_MSE] = { .name = "mcir2-mse",

		.scancode_bits = 0x1fffff, .repeat_period = 150 },

		.scancode_bits = 0x1fffff, .repeat_period = 250 },

	[RC_PROTO_RC6_0] = { .name = "rc-6-0",

		.scancode_bits = 0xffff, .repeat_period = 164 },

		.scancode_bits = 0xffff, .repeat_period = 250 },

	[RC_PROTO_RC6_6A_20] = { .name = "rc-6-6a-20",

		.scancode_bits = 0xfffff, .repeat_period = 164 },

		.scancode_bits = 0xfffff, .repeat_period = 250 },

	[RC_PROTO_RC6_6A_24] = { .name = "rc-6-6a-24",

		.scancode_bits = 0xffffff, .repeat_period = 164 },

		.scancode_bits = 0xffffff, .repeat_period = 250 },

	[RC_PROTO_RC6_6A_32] = { .name = "rc-6-6a-32",

		.scancode_bits = 0xffffffff, .repeat_period = 164 },

		.scancode_bits = 0xffffffff, .repeat_period = 250 },

	[RC_PROTO_RC6_MCE] = { .name = "rc-6-mce",

		.scancode_bits = 0xffff7fff, .repeat_period = 164 },

		.scancode_bits = 0xffff7fff, .repeat_period = 250 },

	[RC_PROTO_SHARP] = { .name = "sharp",

		.scancode_bits = 0x1fff, .repeat_period = 250 },

	[RC_PROTO_XMP] = { .name = "xmp", .repeat_period = 250 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE