summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Abriou <vincent.abriou@st.com>2016-02-05 09:31:18 +0100
committerVincent Abriou <vincent.abriou@st.com>2016-02-26 10:06:17 +0100
commit0a1dc29db379cb05b784bfd7e4628da02f7d4d83 (patch)
treeb143d179c6cbaf9d92beec1456c16c730739c38d
parentdrm/sti: fix panel detection for DVO connector (diff)
downloadlinux-0a1dc29db379cb05b784bfd7e4628da02f7d4d83.tar.xz
linux-0a1dc29db379cb05b784bfd7e4628da02f7d4d83.zip
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>
-rw-r--r--drivers/gpu/drm/sti/sti_tvout.c4
1 files changed, 4 insertions, 0 deletions
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)