[PATCH] drm/i915: Deinitialize audio in case of invalid port

Mika Kahola mika.kahola at intel.com
Wed Oct 11 08:05:35 UTC 2017


Deinitialize i915 audio component if no port was found.

Signed-off-by: Mika Kahola <mika.kahola at intel.com>
---
 drivers/gpu/drm/i915/intel_audio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 0ddba16..497093e 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -845,7 +845,8 @@ static int i915_audio_component_get_eld(struct device *kdev, int port,
 	if (!intel_encoder) {
 		DRM_DEBUG_KMS("Not valid for port %c\n", port_name(port));
 		mutex_unlock(&dev_priv->av_mutex);
-		return ret;
+		intel_audio_deinit(dev_priv);
+		return 0;
 	}
 
 	ret = 0;
-- 
2.7.4



More information about the Intel-gfx-trybot mailing list