[PATCH v2 4/6] ALSA: hda - Add "hdac_acomp" global variable

David Henningsson david.henningsson at canonical.com
Thu Sep 3 11:55:04 UTC 2015


This is a minimum backport of parts of upstream 98d8fc6c5d3652e9,
to make the rest of the series compile.

Signed-off-by: David Henningsson <david.henningsson at canonical.com>
---
 sound/pci/hda/hda_i915.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/pci/hda/hda_i915.c b/sound/pci/hda/hda_i915.c
index aec8a0e..27a21b2 100644
--- a/sound/pci/hda/hda_i915.c
+++ b/sound/pci/hda/hda_i915.c
@@ -33,6 +33,8 @@
 #define AZX_REG_EM4			0x100c
 #define AZX_REG_EM5			0x1010
 
+static struct i915_audio_component *hdac_acomp;
+
 int hda_set_codec_wakeup(struct hda_intel *hda, bool enable)
 {
 	struct i915_audio_component *acomp = &hda->audio_component;
@@ -173,6 +175,7 @@ int hda_i915_init(struct hda_intel *hda)
 	struct i915_audio_component *acomp = &hda->audio_component;
 	int ret;
 
+	hdac_acomp = acomp;
 	component_match_add(dev, &match, hda_component_master_match, hda);
 	ret = component_master_add_with_match(dev, &hda_component_master_ops,
 					      match);
@@ -213,6 +216,7 @@ int hda_i915_init_bpo(struct hda_intel *hda)
 	struct i915_audio_component *acomp = &hda->audio_component;
 	int ret;
 
+	hdac_acomp = acomp;
 	component_match_add(dev, &match, hda_component_master_match_bpo, hda);
 	ret = component_master_add_with_match(dev, &hda_component_master_ops,
 					      match);
-- 
1.9.1





More information about the kernel-team mailing list