From: Vincent Abriou <vincent.abriou@st.com>
Date: Fri, 5 Feb 2016 08:31:18 +0000 (+0100)
Subject: drm/sti: add missing encoder cleanup for DVO connector
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0a1dc29db379cb05b784bfd7e4628da02f7d4d83;p=deliverable%2Flinux.git

drm/sti: add missing encoder cleanup for DVO connector

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---

diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
index 8092418ac65e..e860a41b58aa 100644
--- a/drivers/gpu/drm/sti/sti_tvout.c
+++ b/drivers/gpu/drm/sti/sti_tvout.c
@@ -653,6 +653,10 @@ static void sti_tvout_destroy_encoders(struct sti_tvout *tvout)
 	if (tvout->hda)
 		drm_encoder_cleanup(tvout->hda);
 	tvout->hda = NULL;
+
+	if (tvout->dvo)
+		drm_encoder_cleanup(tvout->dvo);
+	tvout->dvo = NULL;
 }
 
 static int sti_tvout_bind(struct device *dev, struct device *master, void *data)