Skip to content

Commit deac842

Browse files
committed
Merge tag 'sound-fix-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "This contains a one-liner change that has a significant impact: disabling the build of OSS. It's been unmaintained for long time, and we'd like to drop the stuff. Finally, as the first step, stop the build. Let's see whether it works without much complaints. Other than that, there are two small fixes for HD-audio" * tag 'sound-fix-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: sound: Disable the build of OSS drivers ALSA: hda: Fix cpu lockup when stopping the cmd dmas ALSA: hda - Add mute led support for HP EliteBook 840 G3
2 parents 6b402bd + 31cbee6 commit deac842

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

sound/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ endif # SND
115115
menuconfig SOUND_PRIME
116116
tristate "Open Sound System (DEPRECATED)"
117117
select SOUND_OSS_CORE
118+
depends on BROKEN
118119
help
119120
Say 'Y' or 'M' to enable Open Sound System drivers.
120121

sound/hda/hdac_controller.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ void snd_hdac_bus_stop_cmd_io(struct hdac_bus *bus)
106106
/* disable ringbuffer DMAs */
107107
snd_hdac_chip_writeb(bus, RIRBCTL, 0);
108108
snd_hdac_chip_writeb(bus, CORBCTL, 0);
109+
spin_unlock_irq(&bus->reg_lock);
110+
109111
hdac_wait_for_cmd_dmas(bus);
112+
113+
spin_lock_irq(&bus->reg_lock);
110114
/* disable unsolicited responses */
111115
snd_hdac_chip_updatel(bus, GCTL, AZX_GCTL_UNSOL, 0);
112116
spin_unlock_irq(&bus->reg_lock);

sound/pci/hda/patch_conexant.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,9 @@ static const struct hda_fixup cxt_fixups[] = {
860860
{ 0x16, 0x21011020 }, /* line-out */
861861
{ 0x18, 0x2181103f }, /* line-in */
862862
{ }
863-
}
863+
},
864+
.chained = true,
865+
.chain_id = CXT_FIXUP_MUTE_LED_GPIO,
864866
},
865867
[CXT_FIXUP_HP_SPECTRE] = {
866868
.type = HDA_FIXUP_PINS,

0 commit comments

Comments
 (0)