ALSA: hda: Gate ELD usage only by whether ELD is valid
authorStephen Warren <swarren@nvidia.com>
Wed, 1 Jun 2011 17:14:16 +0000 (11:14 -0600)
committerTakashi Iwai <tiwai@suse.de>
Mon, 6 Jun 2011 10:48:45 +0000 (12:48 +0200)
It's perfectly valid for an ELD to contain no SADs. This simply means that
only basic audio is supoprted.

In this case, we still want to limit a PCM's capabilities based on the ELD.

History:

* Originally, ELD application was limited solely by sad_count>0, which
  was used to check that an ELD had been read.
* Later, eld_valid was added to the conditions to satisfy.

This change removes the original sad_count>0 check, which when squashed
with the above two changes ends up replacing if (sad_count) with
if (eld_valid).

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_hdmi.c

index bd0ae697f9c4118ae5947e1f6015d41cff3638ea..8ccec72a8f0c74656b6534155c7ee9d7c01fa1a2 100644 (file)
@@ -816,7 +816,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
                *codec_pars = *hinfo;
 
        eld = &spec->sink_eld[idx];
-       if (!static_hdmi_pcm && eld->eld_valid && eld->sad_count > 0) {
+       if (!static_hdmi_pcm && eld->eld_valid) {
                hdmi_eld_update_pcm_info(eld, hinfo, codec_pars);
                if (hinfo->channels_min > hinfo->channels_max ||
                    !hinfo->rates || !hinfo->formats)