From ed1da83bccfc01acb985e818a2365cfebc190292 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 1 Feb 2013 14:01:27 +0100 Subject: [PATCH] --- yaml --- r: 353231 b: refs/heads/master c: 2ad779b7329d6894a80df94e693e72eaa0d56790 h: refs/heads/master i: 353229: b4938934da61b5de2bf8e6e8a22a5c429aaf047a 353227: 9ee6630a4ebf79a73c73e5b044f29ea5ecdfc1c7 353223: d600a6059ea578192e42269c388e19b3da7ebdca 353215: 37b28b2a64b87b001293962b758167166b1b77e1 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_hdmi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0aa76f147f86..2356679e07e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a7c516bf0cd697dbbee11db6258e3b3146e41a6 +refs/heads/master: 2ad779b7329d6894a80df94e693e72eaa0d56790 diff --git a/trunk/sound/pci/hda/patch_hdmi.c b/trunk/sound/pci/hda/patch_hdmi.c index 807a2aa1ff38..1b3b4ee3e8a7 100644 --- a/trunk/sound/pci/hda/patch_hdmi.c +++ b/trunk/sound/pci/hda/patch_hdmi.c @@ -1100,8 +1100,12 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, if (!static_hdmi_pcm && eld->eld_valid) { snd_hdmi_eld_update_pcm_info(eld, hinfo); if (hinfo->channels_min > hinfo->channels_max || - !hinfo->rates || !hinfo->formats) + !hinfo->rates || !hinfo->formats) { + per_cvt->assigned = 0; + hinfo->nid = 0; + snd_hda_spdif_ctls_unassign(codec, pin_idx); return -ENODEV; + } } /* Store the updated parameters */