5.4-stable patches

added patches:
	alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch

diff --git a/queue-5.4/alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch b/queue-5.4/alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch
new file mode 100644 (file)
index 0000000..0e8ce72
--- /dev/null
+++ b/queue-5.4/alsa-hda-sigmatel-fix-unused-variable-warning-for-beep-power-change.patch
@@ -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
+@@ -4445,7 +4445,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

diff --git a/queue-5.4/series b/queue-5.4/series
index bf07a58a088700e4d06bcdc488a9a4fad0cd6576..333c85a9df18aee64c1bba68e907c82e58904f9e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -40,3 +40,4 @@ mips-octeon-irq-fix-octeon_irq_force_ciu_mapping.patch
 mksysmap-fix-the-mismatch-of-l0-symbols-in-system.ma.patch
 video-fbdev-pxa3xx-gcu-fix-integer-overflow-in-pxa3x.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