From: Greg Kroah-Hartman Date: Mon, 20 Dec 2021 11:06:10 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.4.296~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50a7eba16fc4c606254ae768535ad299c4076bdb;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: input-touchscreen-avoid-bitwise-vs-logical-or-warning.patch --- diff --git a/queue-5.10/input-touchscreen-avoid-bitwise-vs-logical-or-warning.patch b/queue-5.10/input-touchscreen-avoid-bitwise-vs-logical-or-warning.patch new file mode 100644 index 00000000000..7821c527d86 --- /dev/null +++ b/queue-5.10/input-touchscreen-avoid-bitwise-vs-logical-or-warning.patch @@ -0,0 +1,100 @@ +From a02dcde595f7cbd240ccd64de96034ad91cffc40 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Fri, 15 Oct 2021 13:13:06 -0700 +Subject: Input: touchscreen - avoid bitwise vs logical OR warning + +From: Nathan Chancellor + +commit a02dcde595f7cbd240ccd64de96034ad91cffc40 upstream. + +A new warning in clang points out a few places in this driver where a +bitwise OR is being used with boolean types: + +drivers/input/touchscreen.c:81:17: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical] + data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This use of a bitwise OR is intentional, as bitwise operations do not +short circuit, which allows all the calls to touchscreen_get_prop_u32() +to happen so that the last parameter is initialized while coalescing the +results of the calls to make a decision after they are all evaluated. + +To make this clearer to the compiler, use the '|=' operator to assign +the result of each touchscreen_get_prop_u32() call to data_present, +which keeps the meaning of the code the same but makes it obvious that +every one of these calls is expected to happen. + +Signed-off-by: Nathan Chancellor +Reported-by: Nick Desaulniers +Reviewed-by: Nick Desaulniers +Link: https://lore.kernel.org/r/20211014205757.3474635-1-nathan@kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Anders Roxell +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/touchscreen/of_touchscreen.c | 42 ++++++++++++++--------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +--- a/drivers/input/touchscreen/of_touchscreen.c ++++ b/drivers/input/touchscreen/of_touchscreen.c +@@ -79,27 +79,27 @@ void touchscreen_parse_properties(struct + + data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", + input_abs_get_min(input, axis_x), +- &minimum) | +- touchscreen_get_prop_u32(dev, "touchscreen-size-x", +- input_abs_get_max(input, +- axis_x) + 1, +- &maximum) | +- touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x", +- input_abs_get_fuzz(input, axis_x), +- &fuzz); ++ &minimum); ++ data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x", ++ input_abs_get_max(input, ++ axis_x) + 1, ++ &maximum); ++ data_present |= touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x", ++ input_abs_get_fuzz(input, axis_x), ++ &fuzz); + if (data_present) + touchscreen_set_params(input, axis_x, minimum, maximum - 1, fuzz); + + data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", + input_abs_get_min(input, axis_y), +- &minimum) | +- touchscreen_get_prop_u32(dev, "touchscreen-size-y", +- input_abs_get_max(input, +- axis_y) + 1, +- &maximum) | +- touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y", +- input_abs_get_fuzz(input, axis_y), +- &fuzz); ++ &minimum); ++ data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y", ++ input_abs_get_max(input, ++ axis_y) + 1, ++ &maximum); ++ data_present |= touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y", ++ input_abs_get_fuzz(input, axis_y), ++ &fuzz); + if (data_present) + touchscreen_set_params(input, axis_y, minimum, maximum - 1, fuzz); + +@@ -107,11 +107,11 @@ void touchscreen_parse_properties(struct + data_present = touchscreen_get_prop_u32(dev, + "touchscreen-max-pressure", + input_abs_get_max(input, axis), +- &maximum) | +- touchscreen_get_prop_u32(dev, +- "touchscreen-fuzz-pressure", +- input_abs_get_fuzz(input, axis), +- &fuzz); ++ &maximum); ++ data_present |= touchscreen_get_prop_u32(dev, ++ "touchscreen-fuzz-pressure", ++ input_abs_get_fuzz(input, axis), ++ &fuzz); + if (data_present) + touchscreen_set_params(input, axis, 0, maximum, fuzz); + diff --git a/queue-5.10/series b/queue-5.10/series index b0411f4547a..788949720c4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -80,3 +80,4 @@ serial-8250_fintek-fix-garbled-text-for-console.patch timekeeping-really-make-sure-wall_to_monotonic-isn-t-positive.patch libata-if-t_length-is-zero-dma-direction-should-be-dma_none.patch drm-amdgpu-correct-register-access-for-rlc_jump_table_restore.patch +input-touchscreen-avoid-bitwise-vs-logical-or-warning.patch