]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2025 15:59:18 +0000 (17:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2025 15:59:18 +0000 (17:59 +0200)
added patches:
input-sparcspkr-avoid-unannotated-fall-through.patch

queue-6.6/input-sparcspkr-avoid-unannotated-fall-through.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/input-sparcspkr-avoid-unannotated-fall-through.patch b/queue-6.6/input-sparcspkr-avoid-unannotated-fall-through.patch
new file mode 100644 (file)
index 0000000..a5fd6bd
--- /dev/null
@@ -0,0 +1,72 @@
+From 8b1d858cbd4e1800e9336404ba7892b5a721230d Mon Sep 17 00:00:00 2001
+From: WangYuli <wangyuli@uniontech.com>
+Date: Fri, 18 Apr 2025 18:37:18 -0700
+Subject: Input: sparcspkr - avoid unannotated fall-through
+
+From: WangYuli <wangyuli@uniontech.com>
+
+commit 8b1d858cbd4e1800e9336404ba7892b5a721230d upstream.
+
+Fix follow warnings with clang-21i (and reformat for clarity):
+  drivers/input/misc/sparcspkr.c:78:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
+     78 |                 case SND_TONE: break;
+        |                 ^
+  drivers/input/misc/sparcspkr.c:78:3: note: insert 'break;' to avoid fall-through
+     78 |                 case SND_TONE: break;
+        |                 ^
+        |                 break;
+  drivers/input/misc/sparcspkr.c:113:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
+    113 |                 case SND_TONE: break;
+        |                 ^
+  drivers/input/misc/sparcspkr.c:113:3: note: insert 'break;' to avoid fall-through
+    113 |                 case SND_TONE: break;
+        |                 ^
+        |                 break;
+  2 warnings generated.
+
+Signed-off-by: WangYuli <wangyuli@uniontech.com>
+Link: https://lore.kernel.org/r/6730E40353C76908+20250415052439.155051-1-wangyuli@uniontech.com
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/input/misc/sparcspkr.c |   22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+--- a/drivers/input/misc/sparcspkr.c
++++ b/drivers/input/misc/sparcspkr.c
+@@ -75,9 +75,14 @@ static int bbc_spkr_event(struct input_d
+               return -1;
+       switch (code) {
+-              case SND_BELL: if (value) value = 1000;
+-              case SND_TONE: break;
+-              default: return -1;
++      case SND_BELL:
++              if (value)
++                      value = 1000;
++              break;
++      case SND_TONE:
++              break;
++      default:
++              return -1;
+       }
+       if (value > 20 && value < 32767)
+@@ -113,9 +118,14 @@ static int grover_spkr_event(struct inpu
+               return -1;
+       switch (code) {
+-              case SND_BELL: if (value) value = 1000;
+-              case SND_TONE: break;
+-              default: return -1;
++      case SND_BELL:
++              if (value)
++                      value = 1000;
++              break;
++      case SND_TONE:
++              break;
++      default:
++              return -1;
+       }
+       if (value > 20 && value < 32767)
index 93d5196f77c02df50a6013cfc4e34e533900a3b9..775d6d5430191b03496355fc66f0e6235152c124 100644 (file)
@@ -228,3 +228,4 @@ ksmbd-fix-null-pointer-dereference-in-destroy_previous_session.patch
 selinux-fix-selinux_xfrm_alloc_user-to-set-correct-ctx_len.patch
 platform-x86-intel-uncore-freq-fail-module-load-when-plat_info-is-null.patch
 atm-revert-atm_account_tx-if-copy_from_iter_full-fails.patch
+input-sparcspkr-avoid-unannotated-fall-through.patch