From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 14 Aug 2022 10:24:13 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.15.61~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93cbbbcd4b9a2f14987eb66b58cc032b54a09bc8;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	x86-olpc-fix-logical-not-is-only-applied-to-the-left-hand-side.patch
---

diff --git a/queue-5.4/series b/queue-5.4/series
index 5533bcf0981..7ea8bfc9e83 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -255,3 +255,4 @@ scsi-zfcp-fix-missing-auto-port-scan-and-thus-missing-target-ports.patch
 scsi-qla2xxx-fix-discovery-issues-in-fc-al-topology.patch
 scsi-qla2xxx-turn-off-multi-queue-for-8g-adapters.patch
 scsi-qla2xxx-fix-erroneous-mailbox-timeout-after-pci-error-injection.patch
+x86-olpc-fix-logical-not-is-only-applied-to-the-left-hand-side.patch
diff --git a/queue-5.4/x86-olpc-fix-logical-not-is-only-applied-to-the-left-hand-side.patch b/queue-5.4/x86-olpc-fix-logical-not-is-only-applied-to-the-left-hand-side.patch
new file mode 100644
index 00000000000..aa0e889a99a
--- /dev/null
+++ b/queue-5.4/x86-olpc-fix-logical-not-is-only-applied-to-the-left-hand-side.patch
@@ -0,0 +1,49 @@
+From 3a2ba42cbd0b669ce3837ba400905f93dd06c79f Mon Sep 17 00:00:00 2001
+From: Alexander Lobakin <alexandr.lobakin@intel.com>
+Date: Fri, 15 Jul 2022 17:15:36 +0200
+Subject: x86/olpc: fix 'logical not is only applied to the left hand side'
+
+From: Alexander Lobakin <alexandr.lobakin@intel.com>
+
+commit 3a2ba42cbd0b669ce3837ba400905f93dd06c79f upstream.
+
+The bitops compile-time optimization series revealed one more
+problem in olpc-xo1-sci.c:send_ebook_state(), resulted in GCC
+warnings:
+
+arch/x86/platform/olpc/olpc-xo1-sci.c: In function 'send_ebook_state':
+arch/x86/platform/olpc/olpc-xo1-sci.c:83:63: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
+   83 |         if (!!test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == state)
+      |                                                               ^~
+arch/x86/platform/olpc/olpc-xo1-sci.c:83:13: note: add parentheses around left hand side expression to silence this warning
+
+Despite this code working as intended, this redundant double
+negation of boolean value, together with comparing to `char`
+with no explicit conversion to bool, makes compilers think
+the author made some unintentional logical mistakes here.
+Make it the other way around and negate the char instead
+to silence the warnings.
+
+Fixes: d2aa37411b8e ("x86/olpc/xo1/sci: Produce wakeup events for buttons and switches")
+Cc: stable@vger.kernel.org # 3.5+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Reported-by: kernel test robot <lkp@intel.com>
+Reviewed-and-tested-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com>
+Signed-off-by: Yury Norov <yury.norov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/platform/olpc/olpc-xo1-sci.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
++++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
+@@ -81,7 +81,7 @@ static void send_ebook_state(void)
+ 		return;
+ 	}
+ 
+-	if (!!test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == state)
++	if (test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == !!state)
+ 		return; /* Nothing new to report. */
+ 
+ 	input_report_switch(ebook_switch_idev, SW_TABLET_MODE, state);