]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fix/hda' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 31 Jul 2009 08:17:42 +0000 (10:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 31 Jul 2009 08:17:42 +0000 (10:17 +0200)
* 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

sound/pci/hda/hda_eld.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c

index fcad5ec31773df436d9416e37854a08ecc4d7a23..9446a5abea1314da3888ca586594010cabea4cc4 100644 (file)
@@ -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;
index 8c8b273116fbcc71bbe241bd6f9b63c69fbcd2ef..b95df5d5dcc238bb675ffd1be34500acb5a6c503 100644 (file)
@@ -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;
 
index 512f3b9b9a459e27450efad9cb8c875823a99496..5383d8cff88b96583c1af224458ef08c80c662c0 100644 (file)
@@ -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 */
 };