6.11-stable patches

added patches:
	media-stb0899_algo-initialize-cfr-before-using-it.patch
	revert-alsa-hda-conexant-mute-speakers-at-suspend-shutdown.patch

diff --git a/queue-6.11/media-stb0899_algo-initialize-cfr-before-using-it.patch b/queue-6.11/media-stb0899_algo-initialize-cfr-before-using-it.patch
new file mode 100644 (file)
index 0000000..ff5b6de
--- /dev/null
+++ b/queue-6.11/media-stb0899_algo-initialize-cfr-before-using-it.patch
@@ -0,0 +1,34 @@
+From 2d861977e7314f00bf27d0db17c11ff5e85e609a Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Date: Tue, 15 Oct 2024 13:29:43 +0200
+Subject: media: stb0899_algo: initialize cfr before using it
+
+From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+
+commit 2d861977e7314f00bf27d0db17c11ff5e85e609a upstream.
+
+The loop at stb0899_search_carrier() starts with a random
+value for cfr, as reported by Coverity.
+
+Initialize it to zero, just like stb0899_dvbs_algo() to ensure
+that carrier search won't bail out.
+
+Fixes: 8bd135bab91f ("V4L/DVB (9375): Add STB0899 support")
+Cc: stable@vger.kernel.org
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/dvb-frontends/stb0899_algo.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/dvb-frontends/stb0899_algo.c
++++ b/drivers/media/dvb-frontends/stb0899_algo.c
+@@ -269,7 +269,7 @@ static enum stb0899_status stb0899_searc
+ 
+       short int derot_freq = 0, last_derot_freq = 0, derot_limit, next_loop = 3;
+       int index = 0;
+-      u8 cfr[2];
++      u8 cfr[2] = {0};
+       u8 reg;
+ 
+       internal->status = NOCARRIER;

diff --git a/queue-6.11/revert-alsa-hda-conexant-mute-speakers-at-suspend-shutdown.patch b/queue-6.11/revert-alsa-hda-conexant-mute-speakers-at-suspend-shutdown.patch
new file mode 100644 (file)
index 0000000..dcebba5
--- /dev/null
+++ b/queue-6.11/revert-alsa-hda-conexant-mute-speakers-at-suspend-shutdown.patch
@@ -0,0 +1,45 @@
+From c9363bbb0f68dd1ddb8be7bbfe958cdfcd38d851 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaros=C5=82aw=20Janik?= <jaroslaw.janik@gmail.com>
+Date: Wed, 30 Oct 2024 18:18:12 +0100
+Subject: Revert "ALSA: hda/conexant: Mute speakers at suspend / shutdown"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jarosław Janik <jaroslaw.janik@gmail.com>
+
+commit c9363bbb0f68dd1ddb8be7bbfe958cdfcd38d851 upstream.
+
+Commit 4f61c8fe3520 ("ALSA: hda/conexant: Mute speakers at suspend /
+shutdown") mutes speakers on system shutdown or whenever HDA controller
+is suspended by PM; this however interacts badly with Thinkpad's ACPI
+firmware behavior which uses beeps to signal various events (enter/leave
+suspend or hibernation, AC power connect/disconnect, low battery, etc.);
+now those beeps are either muted altogether (for suspend/hibernate/
+shutdown related events) or work more or less randomly (eg. AC
+plug/unplug is only audible when you are playing music at the moment,
+because HDA device is likely in suspend mode otherwise).
+
+Since the original bug report mentioned in 4f61c8fe3520 complained about
+Lenovo's Thinkpad laptop - revert this commit altogether.
+
+Fixes: 4f61c8fe3520 ("ALSA: hda/conexant: Mute speakers at suspend / shutdown")
+Signed-off-by: Jarosław Janik <jaroslaw.janik@gmail.com>
+Link: https://patch.msgid.link/20241030171813.18941-2-jaroslaw.janik@gmail.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_conexant.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -205,8 +205,6 @@ static void cx_auto_shutdown(struct hda_
+ {
+       struct conexant_spec *spec = codec->spec;
+ 
+-      snd_hda_gen_shutup_speakers(codec);
+-
+       /* Turn the problematic codec into D3 to avoid spurious noises
+          from the internal speaker during (and after) reboot */
+       cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false);

diff --git a/queue-6.11/series b/queue-6.11/series
index 00e1581586b92fede9af62f348ae79f1629d1b90..d31e9d6092973d67c7e85cfb91fff031e94ec0ee 100644 (file)
--- a/queue-6.11/series
+++ b/queue-6.11/series
@@ -61,3 +61,5 @@ net-arc-rockchip-fix-emac-mdio-node-support.patch
 rxrpc-fix-missing-locking-causing-hanging-calls.patch
 net-smc-do-not-leave-a-dangling-sk-pointer-in-__smc_.patch
 drivers-net-ionic-add-missed-debugfs-cleanup-to-ioni.patch
+revert-alsa-hda-conexant-mute-speakers-at-suspend-shutdown.patch
+media-stb0899_algo-initialize-cfr-before-using-it.patch