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

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

Merge branch 'fix/hda' into topic/hda

parents fefd67f3 78735cff

sound/pci/hda/hda_eld.c

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void hdmi_write_eld_info(struct snd_info_entry *entry, 
	char name[64];

	char *sname;

	long long val;

	int n;

	unsigned int n;



	while (!snd_info_get_line(buffer, line, sizeof(line))) {

		if (sscanf(line, "%s %llx", name, &val) != 2)
@@ -539,7 +539,7 @@ static void hdmi_write_eld_info(struct snd_info_entry *entry, 
				sname++;

				n = 10 * n + name[4] - '0';

			}

			if (n < 0 || n > 31) /* double the CEA limit */

			if (n >= ELD_MAX_SAD)

				continue;

			if (!strcmp(sname, "_coding_type"))

				e->sad[n].format = val;

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -1794,6 +1794,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { 
				"Dell Studio 1537", STAC_DELL_M6_DMIC),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0,

				"Dell Studio 17", STAC_DELL_M6_DMIC),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02be,

				"Dell Studio 1555", STAC_DELL_M6_DMIC),

	{} /* terminator */

};