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

+6 -4
+2 -2
sound/pci/hda/hda_eld.c
··· 508 508 char name[64]; 509 509 char *sname; 510 510 long long val; 511 - int n; 511 + unsigned int n; 512 512 513 513 while (!snd_info_get_line(buffer, line, sizeof(line))) { 514 514 if (sscanf(line, "%s %llx", name, &val) != 2) ··· 539 539 sname++; 540 540 n = 10 * n + name[4] - '0'; 541 541 } 542 - if (n < 0 || n > 31) /* double the CEA limit */ 542 + if (n >= ELD_MAX_SAD) 543 543 continue; 544 544 if (!strcmp(sname, "_coding_type")) 545 545 e->sad[n].format = val;
+2 -2
sound/pci/hda/patch_realtek.c
··· 275 275 */ 276 276 unsigned int num_init_verbs; 277 277 278 - char stream_name_analog[16]; /* analog PCM stream */ 278 + char stream_name_analog[32]; /* analog PCM stream */ 279 279 struct hda_pcm_stream *stream_analog_playback; 280 280 struct hda_pcm_stream *stream_analog_capture; 281 281 struct hda_pcm_stream *stream_analog_alt_playback; 282 282 struct hda_pcm_stream *stream_analog_alt_capture; 283 283 284 - char stream_name_digital[16]; /* digital PCM stream */ 284 + char stream_name_digital[32]; /* digital PCM stream */ 285 285 struct hda_pcm_stream *stream_digital_playback; 286 286 struct hda_pcm_stream *stream_digital_capture; 287 287
+2
sound/pci/hda/patch_sigmatel.c
··· 1809 1809 "Dell Studio 1537", STAC_DELL_M6_DMIC), 1810 1810 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a0, 1811 1811 "Dell Studio 17", STAC_DELL_M6_DMIC), 1812 + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02be, 1813 + "Dell Studio 1555", STAC_DELL_M6_DMIC), 1812 1814 {} /* terminator */ 1813 1815 }; 1814 1816