Commit 6280b61a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus 

* fix/hda:
  ALSA: hda - Increase PCM stream name buf in patch_realtek.c
  ALSA: hda: fix out-of-bound hdmi_eld.sad[] write
  ALSA: hda - Add quirk for Dell Studio 1555
parents 57e4a5c4 aa563af7

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_realtek.c

+2 −2
Original line number Diff line number Diff line
@@ -275,13 +275,13 @@ struct alc_spec { 
						 */

	unsigned int num_init_verbs;









	char stream_name_analog[16];	/* analog PCM stream */









	char stream_name_analog[32];	/* analog PCM stream */









	struct hda_pcm_stream *stream_analog_playback;









	struct hda_pcm_stream *stream_analog_capture;









	struct hda_pcm_stream *stream_analog_alt_playback;









	struct hda_pcm_stream *stream_analog_alt_capture;

















	char stream_name_digital[16];	/* digital PCM stream */









	char stream_name_digital[32];	/* digital PCM stream */









	struct hda_pcm_stream *stream_digital_playback;









	struct hda_pcm_stream *stream_digital_capture;








































sound/pci/hda/patch_sigmatel.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -1809,6 +1809,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 */









};