iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: rmi4 - f30: detect INPUT_PROP_BUTTONPAD from the button count

Browse Source 
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:
Benjamin Tissoires 2017-03-01 09:57:00 +01:00 committed by Linus Torvalds
parent 044d5dfd62
commit 522214d9be
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/rmi4/rmi_f30.c
View File

@ -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, * 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); __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
return 0; return 0;