Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.1

A few core fixes along with the driver specific ones, mainly fixing
small issues that only affect x86 platforms for various reasons (their
unusual machine enumeration mechanisms mainly, plus a fix for error
handling in topology).

There's some of the driver fixes that look larger than they are, like
the hdmi-codec changes which resulted in an indentation change, and most
of the other large changes are for new drivers like the STM32 changes.

2 files changed, 6 insertions, 4 deletions

diff --git a/sound/hda/hdac_component.c b/sound/hda/hdac_component.c
index 6b5caee61c6e..1ea51e3b942a 100644
--- a/sound/hda/hdac_component.c
+++ b/sound/hda/hdac_component.c
@@ -273,7 +273,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_acomp_register_notifier);
  */
 int snd_hdac_acomp_init(struct hdac_bus *bus,
                         const struct drm_audio_component_audio_ops *aops,
-                        int (*match_master)(struct device *, void *),
+                        int (*match_master)(struct device *, int, void *),
                         size_t extra_size)
 {
         struct component_match *match = NULL;
@@ -292,7 +292,7 @@ int snd_hdac_acomp_init(struct hdac_bus *bus,
         bus->audio_component = acomp;
         devres_add(dev, acomp);
 
-        component_match_add(dev, &match, match_master, bus);
+        component_match_add_typed(dev, &match, match_master, bus);
         ret = component_master_add_with_match(dev, &hdac_component_master_ops,
                                               match);
         if (ret < 0)
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 27eb0270a711..575198bd3cd0 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -82,9 +82,11 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus)
 }
 EXPORT_SYMBOL_GPL(snd_hdac_i915_set_bclk);
 
-static int i915_component_master_match(struct device *dev, void *data)
+static int i915_component_master_match(struct device *dev, int subcomponent,
+                                       void *data)
 {
-        return !strcmp(dev->driver->name, "i915");
+        return !strcmp(dev->driver->name, "i915") &&
+               subcomponent == I915_COMPONENT_AUDIO;
 }
 
 /* check whether intel graphics is present */