diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-30 18:08:54 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-30 18:08:54 +0200 |
| commit | d195658bd785e9384d2f70937034ceb13d5e4bcc (patch) | |
| tree | 848dde2523b0d13dea331f2c433af71f9ec80268 | |
| parent | fefd67f31ee7f5259344e36a237d59b47e8715cf (diff) | |
| parent | 78735cffc2d9ab0dec32f1ba7cbc1d84b45bbf29 (diff) | |
| download | kernel_samsung_espresso10-d195658bd785e9384d2f70937034ceb13d5e4bcc.zip kernel_samsung_espresso10-d195658bd785e9384d2f70937034ceb13d5e4bcc.tar.gz kernel_samsung_espresso10-d195658bd785e9384d2f70937034ceb13d5e4bcc.tar.bz2 | |
Merge branch 'fix/hda' into topic/hda
| -rw-r--r-- | sound/pci/hda/hda_eld.c | 4 | ||||
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index fcad5ec..9446a5a 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c @@ -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; diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index c7e5de6..e5fbec3 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -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 */ }; |