]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Revert "ALSA: hda/conexant: Mute speakers at suspend / shutdown"
authorJarosław Janik <jaroslaw.janik@gmail.com>
Wed, 30 Oct 2024 17:18:12 +0000 (18:18 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 31 Oct 2024 15:05:01 +0000 (16:05 +0100)
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>
sound/pci/hda/patch_conexant.c

index c74f6742c35955e51aefe10081bff3bd2290e05d..b2bcdf76da30582f287370af56c3813ced9108c0 100644 (file)
@@ -205,8 +205,6 @@ static void cx_auto_shutdown(struct hda_codec *codec)
 {
        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);