Skip to content

Commit

Permalink
Input: iqs7222 - correct slider event disable logic
Browse files Browse the repository at this point in the history
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: e505eda ("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>
  • Loading branch information
Jeff LaBundy authored and Dmitry Torokhov committed Jun 27, 2022
1 parent 0efff5c commit 56a0c54
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/input/misc/iqs7222.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 56a0c54

Please sign in to comment.