Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
  ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
  ALSA: hda - Keep EAPD turned on for old Conexant chips
  ALSA: hda/realtek - Fix missing volume controls with ALC260
  ASoC: wm8940: Properly set codec->dapm.bias_level
  ALSA: hda - Fix pin-config for ASUS W90V
  ALSA: hda - Fix surround/CLFE headphone and speaker pins order
  ALSA: hda - Fix typo
  ALSA: Update the sound git tree URL
  ALSA: HDA: Add new revision for ALC662
  ASoC: max98095: Convert codec->hw_write to snd_soc_write
  ASoC: keep pointer to resource so it can be freed
  ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
  ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
  ASoC: da7210: Add support for line out and DAC
  ASoC: da7210: Add support for DAPM
  ALSA: hda/realtek - Fix DAC assignments of multiple speakers
  ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
  ASoC: Set sgtl5000->ldo in ldo_regulator_register
  ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
  ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
  ...

1 files changed, 32 insertions, 7 deletions

diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index c34f730f4815..1c8ddf547a2d 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -318,6 +318,11 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
         int size;
         unsigned char *buf;
 
+        /*
+         * ELD size is initialized to zero in caller function. If no errors and
+         * ELD is valid, actual eld_size is assigned in hdmi_update_eld()
+         */
+
         if (!eld->eld_valid)
                 return -ENOENT;
 
@@ -327,14 +332,13 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
                 snd_printd(KERN_INFO "HDMI: ELD buf size is 0, force 128\n");
                 size = 128;
         }
-        if (size < ELD_FIXED_BYTES || size > PAGE_SIZE) {
+        if (size < ELD_FIXED_BYTES || size > ELD_MAX_SIZE) {
                 snd_printd(KERN_INFO "HDMI: invalid ELD buf size %d\n", size);
                 return -ERANGE;
         }
 
-        buf = kmalloc(size, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
+        /* set ELD buffer */
+        buf = eld->eld_buffer;
 
         for (i = 0; i < size; i++) {
                 unsigned int val = hdmi_get_eld_data(codec, nid, i);
@@ -356,10 +360,31 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
         ret = hdmi_update_eld(eld, buf, size);
 
 error:
-        kfree(buf);
         return ret;
 }
 
+/**
+ * SNDRV_PCM_RATE_* and AC_PAR_PCM values don't match, print correct rates with
+ * hdmi-specific routine.
+ */
+static void hdmi_print_pcm_rates(int pcm, char *buf, int buflen)
+{
+        static unsigned int alsa_rates[] = {
+                5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,
+                96000, 176400, 192000, 384000
+        };
+        int i, j;
+
+        for (i = 0, j = 0; i < ARRAY_SIZE(alsa_rates); i++)
+                if (pcm & (1 << i))
+                        j += snprintf(buf + j, buflen - j,  " %d",
+                                alsa_rates[i]);
+
+        buf[j] = '\0'; /* necessary when j == 0 */
+}
+
+#define SND_PRINT_RATES_ADVISED_BUFSIZE 80
+
 static void hdmi_show_short_audio_desc(struct cea_sad *a)
 {
         char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];
@@ -368,7 +393,7 @@ static void hdmi_show_short_audio_desc(struct cea_sad *a)
         if (!a->format)
                 return;
 
-        snd_print_pcm_rates(a->rates, buf, sizeof(buf));
+        hdmi_print_pcm_rates(a->rates, buf, sizeof(buf));
 
         if (a->format == AUDIO_CODING_TYPE_LPCM)
                 snd_print_pcm_bits(a->sample_bits, buf2 + 8, sizeof(buf2) - 8);
@@ -427,7 +452,7 @@ static void hdmi_print_sad_info(int i, struct cea_sad *a,
                         i, a->format, cea_audio_coding_type_names[a->format]);
         snd_iprintf(buffer, "sad%d_channels\t\t%d\n", i, a->channels);
 
-        snd_print_pcm_rates(a->rates, buf, sizeof(buf));
+        hdmi_print_pcm_rates(a->rates, buf, sizeof(buf));
         snd_iprintf(buffer, "sad%d_rates\t\t[0x%x]%s\n", i, a->rates, buf);
 
         if (a->format == AUDIO_CODING_TYPE_LPCM) {