leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: iqs7222 - correct slider event disable logic

Browse Source 
If a positive swipe/flick gesture is defined but the corresponding
negative gesture is not, the former is inadvertently disabled. Fix
this by gently refactoring the logic responsible for disabling all
gestures by default.

As part of this change, make the code a bit simpler by eliminating
a superfluous conditional check. If a slider event does not define
an enable control, the second term of the bitwise AND operation is
simply 0xFFFF.

Fixes: e505edaedc ("Input: add support for Azoteq IQS7222A/B/C")
Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/20220626072412.475211-2-jeff@labundy.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jeff LaBundy 2022-06-27 15:13:49 -07:00 committed by Dmitry Torokhov
parent 0efff5c0e5
commit 56a0c54c4c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/misc/iqs7222.c
View File

@ -2081,17 +2081,19 @@ static int iqs7222_parse_sldr(struct iqs7222_private *iqs7222, int sldr_index)
sldr_setup[0] |= dev_desc->wheel_enable;
}
/*
* The absence of a register offset makes it safe to assume the device
* supports gestures, each of which is first disabled until explicitly
* enabled.
*/
if (!reg_offset)
for (i = 0; i < ARRAY_SIZE(iqs7222_sl_events); i++)
sldr_setup[9] &= ~iqs7222_sl_events[i].enable;
for (i = 0; i < ARRAY_SIZE(iqs7222_sl_events); i++) {
const char *event_name = iqs7222_sl_events[i].name;
struct fwnode_handle *event_node;
/*
* The absence of a register offset means the remaining fields
* in the group represent gesture settings.
*/
if (iqs7222_sl_events[i].enable && !reg_offset)
sldr_setup[9] &= ~iqs7222_sl_events[i].enable;
event_node = fwnode_get_named_child_node(sldr_node, event_name);
if (!event_node)
continue;