mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
Input: touchscreen - Fix backport of a02dcde595
Upstream commita02dcde595
("Input: touchscreen - avoid bitwise vs logical OR warning") was applied as commitf6e9e7be9b
("Input: touchscreen - avoid bitwise vs logical OR warning") in linux-5.4.y but it did not properly account for commitd9265e8a87
("Input: of_touchscreen - add support for touchscreen-min-x|y"), which means the warning mentioned in the commit message is not fully fixed: drivers/input/touchscreen/of_touchscreen.c:78:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/input/touchscreen/of_touchscreen.c:78:17: note: cast one or both operands to int to silence this warning drivers/input/touchscreen/of_touchscreen.c:92:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/input/touchscreen/of_touchscreen.c:92:17: note: cast one or both operands to int to silence this warning 2 warnings generated. It seems like the 4.19 backport was applied to the 5.4 tree, which did not have any conflicts so no issue was noticed at that point. Fix up the backport to bring it more in line with the upstream version so that there is no warning. Fixes:f6e9e7be9b
("Input: touchscreen - avoid bitwise vs logical OR warning") Signed-off-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
6e80d2ee44
commit
6904679c84
1 changed files with 4 additions and 4 deletions
|
@ -77,8 +77,8 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
|
||||||
axis = multitouch ? ABS_MT_POSITION_X : ABS_X;
|
axis = multitouch ? ABS_MT_POSITION_X : ABS_X;
|
||||||
data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",
|
data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",
|
||||||
input_abs_get_min(input, axis),
|
input_abs_get_min(input, axis),
|
||||||
&minimum) |
|
&minimum);
|
||||||
touchscreen_get_prop_u32(dev, "touchscreen-size-x",
|
data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x",
|
||||||
input_abs_get_max(input,
|
input_abs_get_max(input,
|
||||||
axis) + 1,
|
axis) + 1,
|
||||||
&maximum);
|
&maximum);
|
||||||
|
@ -91,8 +91,8 @@ void touchscreen_parse_properties(struct input_dev *input, bool multitouch,
|
||||||
axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;
|
axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;
|
||||||
data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y",
|
data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y",
|
||||||
input_abs_get_min(input, axis),
|
input_abs_get_min(input, axis),
|
||||||
&minimum) |
|
&minimum);
|
||||||
touchscreen_get_prop_u32(dev, "touchscreen-size-y",
|
data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y",
|
||||||
input_abs_get_max(input,
|
input_abs_get_max(input,
|
||||||
axis) + 1,
|
axis) + 1,
|
||||||
&maximum);
|
&maximum);
|
||||||
|
|
Loading…
Reference in a new issue