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

Commit e4cfb034 authored by Andrew Liu's avatar Andrew Liu Committed by Dmitry Torokhov
Browse files

Input: keyboard - "keycode & KEY_MAX" changes some keycode values 



For exmaple, keycode: KEY_OK(0x160) is changed by "and" operation with
KEY_MAX(0x2ff) to KEY_KPENTER(96).

Signed-off-by: default avatarAndrew Liu <andrew.liu200917@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5cf0eb98

drivers/input/keyboard/adp5588-keys.c

+2 −1
Original line number Diff line number Diff line
@@ -536,7 +536,8 @@ static int adp5588_probe(struct i2c_client *client, 
		__set_bit(EV_REP, input->evbit);



	for (i = 0; i < input->keycodemax; i++)

		__set_bit(kpad->keycode[i] & KEY_MAX, input->keybit);

		if (kpad->keycode[i] <= KEY_MAX)

			__set_bit(kpad->keycode[i], input->keybit);

	__clear_bit(KEY_RESERVED, input->keybit);



	if (kpad->gpimapsize)

drivers/input/keyboard/adp5589-keys.c

+2 −1
Original line number Diff line number Diff line
@@ -992,7 +992,8 @@ static int adp5589_probe(struct i2c_client *client, 
		__set_bit(EV_REP, input->evbit);



	for (i = 0; i < input->keycodemax; i++)

		__set_bit(kpad->keycode[i] & KEY_MAX, input->keybit);

		if (kpad->keycode[i] <= KEY_MAX)

			__set_bit(kpad->keycode[i], input->keybit);

	__clear_bit(KEY_RESERVED, input->keybit);



	if (kpad->gpimapsize)

drivers/input/keyboard/bf54x-keys.c

+2 −1
Original line number Diff line number Diff line
@@ -289,7 +289,8 @@ static int bfin_kpad_probe(struct platform_device *pdev) 
		__set_bit(EV_REP, input->evbit);



	for (i = 0; i < input->keycodemax; i++)

		__set_bit(bf54x_kpad->keycode[i] & KEY_MAX, input->keybit);

		if (bf54x_kpad->keycode[i] <= KEY_MAX)

			__set_bit(bf54x_kpad->keycode[i], input->keybit);

	__clear_bit(KEY_RESERVED, input->keybit);



	error = input_register_device(input);

drivers/input/misc/pcf8574_keypad.c

+5 −2
Original line number Diff line number Diff line
@@ -113,9 +113,12 @@ static int pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_i 
	idev->keycodemax = ARRAY_SIZE(lp->btncode);



	for (i = 0; i < ARRAY_SIZE(pcf8574_kp_btncode); i++) {

		if (lp->btncode[i] <= KEY_MAX) {

			lp->btncode[i] = pcf8574_kp_btncode[i];

		__set_bit(lp->btncode[i] & KEY_MAX, idev->keybit);

			__set_bit(lp->btncode[i], idev->keybit);

		}

	}

	__clear_bit(KEY_RESERVED, idev->keybit);



	sprintf(lp->name, DRV_NAME);

	sprintf(lp->phys, "kp_data/input0");