Input: rmi4 - f30: detect INPUT_PROP_BUTTONPAD from the button count
INPUT_PROP_BUTTONPAD is currently only set through the platform data. The RMI4 header doc says that this property is there to force the buttonpad property, so we also need to detect it by looking at the exported buttons count. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
044d5dfd62
Коммит
522214d9be
|
@ -258,9 +258,10 @@ static int rmi_f30_map_gpios(struct rmi_function *fn,
|
|||
|
||||
/*
|
||||
* Buttonpad could be also inferred from f30->has_mech_mouse_btns,
|
||||
* but I am not sure, so use only the pdata info.
|
||||
* but I am not sure, so use only the pdata info and the number of
|
||||
* mapped buttons.
|
||||
*/
|
||||
if (pdata->f30_data.buttonpad)
|
||||
if (pdata->f30_data.buttonpad || (button - BTN_LEFT == 1))
|
||||
__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
|
||||
|
||||
return 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче