From 3a321d2f6d23d3d2fdc862c16333207692bcde15 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 30 Jul 2009 18:08:54 +0200 Subject: [PATCH] --- yaml --- r: 157821 b: refs/heads/master c: d195658bd785e9384d2f70937034ceb13d5e4bcc h: refs/heads/master i: 157819: 5e3fa25b76b85219e0e573b2960f27576454a826 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_eld.c | 4 ++-- trunk/sound/pci/hda/patch_sigmatel.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8115cd72bd02..b3e2d7b87d46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fefd67f31ee7f5259344e36a237d59b47e8715cf +refs/heads/master: d195658bd785e9384d2f70937034ceb13d5e4bcc diff --git a/trunk/sound/pci/hda/hda_eld.c b/trunk/sound/pci/hda/hda_eld.c index fcad5ec31773..9446a5abea13 100644 --- a/trunk/sound/pci/hda/hda_eld.c +++ b/trunk/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/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index c7e5de6e394e..e5fbec37ffdd 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/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 */ };