Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9bbb475 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into topic/hda-switcheroo

parents 3e9e63db 8c7dd890

sound/pci/echoaudio/echoaudio_dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int load_firmware(struct echoaudio *chip) 
	const struct firmware *fw;

	int box_type, err;



	if (snd_BUG_ON(!chip->dsp_code_to_load || !chip->comm_page))

	if (snd_BUG_ON(!chip->comm_page))

		return -EPERM;



	/* See if the ASIC is present and working - only if the DSP is already loaded */

sound/pci/hda/Makefile

+1 −1
Original line number Diff line number Diff line 
snd-hda-intel-objs := hda_intel.o



snd-hda-codec-y := hda_codec.o hda_jack.o

snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o

snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

sound/pci/hda/hda_auto_parser.c

0 → 100644
+760 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_auto_parser.h

0 → 100644
+160 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/hda_codec.c

+245 −704

File changed.

Preview size limit exceeded, changes collapsed.