diff options
| -rw-r--r-- | queue-5.15/input-sparcspkr-avoid-unannotated-fall-through.patch | 72 | ||||
| -rw-r--r-- | queue-5.15/series | 1 |
2 files changed, 73 insertions, 0 deletions
diff --git a/queue-5.15/input-sparcspkr-avoid-unannotated-fall-through.patch b/queue-5.15/input-sparcspkr-avoid-unannotated-fall-through.patch new file mode 100644 index 00000000000..ebbd2a108ac --- /dev/null +++ b/queue-5.15/input-sparcspkr-avoid-unannotated-fall-through.patch @@ -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 +@@ -74,9 +74,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) +@@ -112,9 +117,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) diff --git a/queue-5.15/series b/queue-5.15/series index 3db7a84db34..2a64c596556 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -356,3 +356,4 @@ selinux-fix-selinux_xfrm_alloc_user-to-set-correct-ctx_len.patch atm-revert-atm_account_tx-if-copy_from_iter_full-fails.patch hid-usbhid-eliminate-recurrent-out-of-bounds-bug-in-usbhid_parse.patch block-default-block_legacy_autoload-to-y.patch +input-sparcspkr-avoid-unannotated-fall-through.patch |