diff options
| author |   Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-02-20 11:27:15 +0200 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-02-20 11:53:48 +0200 |
| commit | b08e776c223c5faa2f2768d5e597cf6549445593 (patch) | |
| tree | 05039e6ddc9774d9e02595033909aa4e33dd4e9e /sound/hda/hdac_component.c | |
| parent | Merge drm/drm-next into drm-intel-next-queued (diff) | |
| parent | drm/audio: declaration of struct device (diff) | |
| download | linux-dev-b08e776c223c5faa2f2768d5e597cf6549445593.tar.xz linux-dev-b08e776c223c5faa2f2768d5e597cf6549445593.zip | |
Merge tag 'topic/mei-hdcp-2019-02-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next-queued
Prep patches + headers for the mei-hdcp/i915 component interfaces
Also contains the prep work in the component helpers plus adjustements
for the snd-hda/i915 component interface.
Plus one small static inline in the drm_hdcp.h header that both i915
and mei_hdcp will need.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190219071619.GA11016@phenom.ffwll.local
Diffstat (limited to 'sound/hda/hdac_component.c')
| -rw-r--r-- | sound/hda/hdac_component.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/hda/hdac_component.c b/sound/hda/hdac_component.c index 2702548b788a..13915fdc6a54 100644 --- a/sound/hda/hdac_component.c +++ b/sound/hda/hdac_component.c @@ -275,7 +275,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; @@ -294,7 +294,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) |