On Wed, 02 Mar 2016 06:19:43 +0100, libin.yang@linux.intel.com wrote:
From: Libin Yang libin.yang@linux.intel.com
Defer to register acomp eld notifier until hdmi audio driver is fully ready.
When you submit a patch, especially fixing something, please give always "why". This is the most important information.
thanks,
Takashi
Signed-off-by: Libin Yang libin.yang@linux.intel.com
sound/pci/hda/patch_hdmi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index aa2d6a2..a3de50b 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2936,13 +2936,6 @@ static int patch_generic_hdmi(struct hda_codec *codec) is_broxton(codec)) codec->core.link_power_control = 1;
- if (codec_has_acomp(codec)) {
codec->depop_delay = 0;spec->i915_audio_ops.audio_ptr = codec;spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;snd_hdac_i915_register_notifier(&spec->i915_audio_ops);- }
- if (hdmi_parse_codec(codec) < 0) { if (spec->i915_bound) snd_hdac_i915_exit(&codec->bus->core);
@@ -2964,6 +2957,13 @@ static int patch_generic_hdmi(struct hda_codec *codec)
init_channel_allocations();
- if (codec_has_acomp(codec)) {
codec->depop_delay = 0;spec->i915_audio_ops.audio_ptr = codec;spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;snd_hdac_i915_register_notifier(&spec->i915_audio_ops);- }
- WARN_ON(spec->dyn_pcm_assign && !codec_has_acomp(codec)); return 0;
}
1.9.1