Merge commit 'main-jb-2012.08.03-B4' into t114-0806
[linux-2.6.git] / sound / pci / hda / hda_eld.c
index 92ba186..cc15d09 100644 (file)
@@ -443,6 +443,10 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld,
                        codec->recv_dec_cap |= (1 << AUDIO_CODING_TYPE_AC3);
                } else if (eld->sad[i].format == AUDIO_CODING_TYPE_DTS) {
                        codec->recv_dec_cap |= (1 << AUDIO_CODING_TYPE_DTS);
+               } else if (eld->sad[i].format == AUDIO_CODING_TYPE_LPCM) {
+                       codec->max_pcm_channels =
+                               eld->sad[i].channels > codec->max_pcm_channels ?
+                               eld->sad[i].channels : codec->max_pcm_channels;
                }
        }