5.4-stable patches

added patches:
	input-touchscreen-fix-backport-of-a02dcde595f7cbd240ccd64de96034ad91cffc40.patch

diff --git a/queue-5.4/input-touchscreen-fix-backport-of-a02dcde595f7cbd240ccd64de96034ad91cffc40.patch b/queue-5.4/input-touchscreen-fix-backport-of-a02dcde595f7cbd240ccd64de96034ad91cffc40.patch
new file mode 100644 (file)
index 0000000..54cb731
--- /dev/null
+++ b/queue-5.4/input-touchscreen-fix-backport-of-a02dcde595f7cbd240ccd64de96034ad91cffc40.patch
@@ -0,0 +1,64 @@
+From nathan@kernel.org  Wed Jan  5 16:03:30 2022
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon,  3 Jan 2022 12:29:35 -0700
+Subject: Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>, stable@vger.kernel.org, llvm@lists.linux.dev, Anders Roxell <anders.roxell@linaro.org>, Nathan Chancellor <nathan@kernel.org>
+Message-ID: <20220103192935.3438038-1-nathan@kernel.org>
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+Upstream commit a02dcde595f7 ("Input: touchscreen - avoid bitwise vs
+logical OR warning") was applied as commit f6e9e7be9b80 ("Input:
+touchscreen - avoid bitwise vs logical OR warning") in linux-5.4.y but
+it did not properly account for commit d9265e8a878a ("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: f6e9e7be9b80 ("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>
+---
+ drivers/input/touchscreen/of_touchscreen.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/input/touchscreen/of_touchscreen.c
++++ b/drivers/input/touchscreen/of_touchscreen.c
+@@ -77,8 +77,8 @@ void touchscreen_parse_properties(struct
+       axis = multitouch ? ABS_MT_POSITION_X : ABS_X;
+       data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x",
+                                               input_abs_get_min(input, axis),
+-                                              &minimum) |
+-                     touchscreen_get_prop_u32(dev, "touchscreen-size-x",
++                                              &minimum);
++      data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-x",
+                                               input_abs_get_max(input,
+                                                                 axis) + 1,
+                                               &maximum);
+@@ -91,8 +91,8 @@ void touchscreen_parse_properties(struct
+       axis = multitouch ? ABS_MT_POSITION_Y : ABS_Y;
+       data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y",
+                                               input_abs_get_min(input, axis),
+-                                              &minimum) |
+-                     touchscreen_get_prop_u32(dev, "touchscreen-size-y",
++                                              &minimum);
++      data_present |= touchscreen_get_prop_u32(dev, "touchscreen-size-y",
+                                               input_abs_get_max(input,
+                                                                 axis) + 1,
+                                               &maximum);

diff --git a/queue-5.4/series b/queue-5.4/series
index a73b51d993e3607112ebe1f0ca30643912030586..1f43ad862a6c709a623b953af1a89c7dc291ee00 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1 +1,2 @@
 f2fs-quota-fix-potential-deadlock.patch
+input-touchscreen-fix-backport-of-a02dcde595f7cbd240ccd64de96034ad91cffc40.patch