diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-07-31 10:17:42 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-07-31 10:17:42 +0200 |
commit | 6280b61af50ef3086816a9e753af355690fa78db (patch) | |
tree | dbd1303da3c576b4c7adf266f3091110f1285c96 /sound/pci/hda/hda_eld.c | |
parent | 57e4a5c4f8cfb4b198830c5400f9fc9eb7b75091 (diff) | |
parent | aa563af763373a7e67a7b8fdb427d2a2fcbeab3b (diff) |
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
Diffstat (limited to 'sound/pci/hda/hda_eld.c')
-rw-r--r-- | sound/pci/hda/hda_eld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index fcad5ec3177..9446a5abea1 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; |