diff options
Diffstat (limited to 'sound/x86/intel_hdmi_lpe_audio.c')
| -rw-r--r-- | sound/x86/intel_hdmi_lpe_audio.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sound/x86/intel_hdmi_lpe_audio.c b/sound/x86/intel_hdmi_lpe_audio.c index a9fd2d34a921..ce24ef1dd491 100644 --- a/sound/x86/intel_hdmi_lpe_audio.c +++ b/sound/x86/intel_hdmi_lpe_audio.c @@ -34,6 +34,7 @@ #include <sound/initval.h> #include <drm/intel_lpe_audio.h> #include "intel_hdmi_lpe_audio.h" +#include "intel_hdmi_audio.h" /* globals*/ static struct platform_device *hlpe_pdev; @@ -450,9 +451,9 @@ static void notify_audio_lpe(void *audio_ptr) /** * hdmi_lpe_audio_probe - start bridge with i915 * - * This function is called when the i915 driver creates the hdmi-lpe-audio - * platform device. Card creation is deferred until a hot plug event is - * received + * This function is called when the i915 driver creates the + * hdmi-lpe-audio platform device. Card creation is deferred until a + * hot plug event is received */ static int hdmi_lpe_audio_probe(struct platform_device *pdev) { @@ -495,8 +496,8 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) (unsigned int)res_mmio->end); mmio_start = ioremap_nocache(res_mmio->start, - (size_t)((res_mmio->end - res_mmio->start) - + 1)); + (size_t)((res_mmio->end - + res_mmio->start) + 1)); if (!mmio_start) { dev_err(&hlpe_pdev->dev, "Could not get ioremap\n"); return -EACCES; @@ -548,11 +549,11 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); + ret = hdmi_audio_probe((void *)pdev); dev_dbg(&hlpe_pdev->dev, "hdmi lpe audio: setting pin eld notify callback\n"); spin_lock_irqsave(&pdata->lpe_audio_slock, flag_irq); pdata->notify_audio_lpe = notify_audio_lpe; - if (pdata->notify_pending) { dev_dbg(&hlpe_pdev->dev, "%s: handle pending notification\n", __func__); @@ -576,6 +577,8 @@ static int hdmi_lpe_audio_remove(struct platform_device *pdev) dev_dbg(&hlpe_pdev->dev, "Enter %s\n", __func__); + hdmi_audio_remove(pdev); + /* get context, release resources */ ctx = platform_get_drvdata(pdev); iounmap(ctx->mmio_start); |