]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Sep 2022 10:49:57 +0000 (12:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Sep 2022 10:49:57 +0000 (12:49 +0200)
added patches:
alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch

queue-5.15/alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch [new file with mode: 0644]
queue-5.15/series

diff --git a/queue-5.15/alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch b/queue-5.15/alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch
new file mode 100644 (file)
index 0000000..11c3001
--- /dev/null
@@ -0,0 +1,33 @@
+From 51bdc8bb82525cd70feb92279c8b7660ad7948dd Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 5 Sep 2022 15:06:30 +0200
+Subject: ALSA: hda/sigmatel: Fix unused variable warning for beep power change
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 51bdc8bb82525cd70feb92279c8b7660ad7948dd upstream.
+
+The newly added stac_check_power_status() caused a compile warning
+when CONFIG_SND_HDA_INPUT_BEEP is disabled.  Fix it.
+
+Fixes: 414d38ba8710 ("ALSA: hda/sigmatel: Keep power up while beep is enabled")
+Reported-by: kernel test robot <lkp@intel.com>
+Link: https://lore.kernel.org/r/20220905130630.2845-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_sigmatel.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -4447,7 +4447,9 @@ static int stac_suspend(struct hda_codec
+ static int stac_check_power_status(struct hda_codec *codec, hda_nid_t nid)
+ {
++#ifdef CONFIG_SND_HDA_INPUT_BEEP
+       struct sigmatel_spec *spec = codec->spec;
++#endif
+       int ret = snd_hda_gen_check_power_status(codec, nid);
+ #ifdef CONFIG_SND_HDA_INPUT_BEEP
index 4f49ce1696a5a1e1d64c3b78912907f8d9ab5043..beb78374252b71882a978b5f28f210e9f9d9ad1c 100644 (file)
@@ -42,3 +42,4 @@ video-fbdev-pxa3xx-gcu-fix-integer-overflow-in-pxa3x.patch
 net-find-dst-with-sk-s-xfrm-policy-not-ctl_sk.patch
 kvm-sev-add-cache-flush-to-solve-sev-cache-incoherency-issues.patch
 cgroup-add-missing-cpus_read_lock-to-cgroup_attach_task_all.patch
+alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch